Merge branch 'main' into web_test_reorganization

.ci.yaml

@@ -24,7 +24,7 @@ platform_properties:
       ios_debug: "false"
       ios_profile: "false"
       ios_release: "false"
-      # CIPD flutter_internal/java/openjdk/$platform
+      # CIPD flutter/java/openjdk/$platform
       dependencies: >-
         [
           {"dependency": "open_jdk", "version": "version:11"},
@@ -46,7 +46,7 @@ platform_properties:
       ios_debug: "false"
       ios_profile: "false"
       ios_release: "false"
-      # CIPD flutter_internal/java/openjdk/$platform
+      # CIPD flutter/java/openjdk/$platform
       dependencies: >-
         [
           {"dependency": "open_jdk", "version": "version:11"}
@@ -68,7 +68,7 @@ platform_properties:
       ios_debug: "false"
       ios_profile: "false"
       ios_release: "false"
-      # CIPD flutter_internal/java/openjdk/$platform
+      # CIPD flutter/java/openjdk/$platform
       dependencies: >-
         [
           {"dependency": "open_jdk", "version": "version:11"}
@@ -156,6 +156,7 @@ targets:
       emulator_arch: "x64"
       enable_cso: "true"
     timeout: 60
+    bringup: true
 
   - name: Linux Fuchsia arm64 FEMU
     recipe: engine/femu_test
@@ -168,6 +169,7 @@ targets:
       emulator_arch: "arm64"
       enable_cso: "true"
     timeout: 60
+    bringup: true
 
   - name: Linux Framework Smoke Tests
     recipe: engine/framework_smoke

DEPS

@@ -18,7 +18,7 @@ vars = {
   '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': '1c36c5c38ef4742a4e359484ab15a670c06902d9',
+  'skia_revision': '9b7c0ae5007a1665fefc9a316bfcdfe40763ed89',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,7 +48,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'c766fffb626ecac3be237703d4c68178f308e5f3',
+  'dart_revision': '2cd913e06b8c41c9b9afd139bedff8fc6d0bb232',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -455,7 +455,7 @@ deps = {
    Var('dart_git') + '/test_reflective_loader.git@c4c2d5c3f94a96f3fc79e9e28944fba391bc544c',
 
   'src/third_party/dart/third_party/pkg/tools':
-   Var('dart_git') + '/tools.git@bed358ea8ca10551c710282be96cf6e95620fb24',
+   Var('dart_git') + '/tools.git@e5353aa3ae4bcaa75cd0ac48a6e47035c57df942',
 
   'src/third_party/dart/third_party/pkg/typed_data':
    Var('dart_git') + '/typed_data.git@f858046fb420cf644e7d8cb86b7893f2830d8a6c',
@@ -832,7 +832,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'lfirU5p2GigxFWZVA4s5fWx9-lhElkibhnNu2A3LOAgC'
+        'version': '3NfZ5JD61eNz4jJqBXd_5fmribyv-hlizMbWAs_TvzkC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -842,7 +842,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'VFZ_BtgLOf7FaEr6XYKW1wXqPuy7nQFMxd3P6-d9XwgC'
+        'version': 'bXql_WHqGrwP5ZIWm0zEgGn21zyirWdpx439qYw4-GIC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

build/archives/BUILD.gn

@@ -170,6 +170,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 = []

ci/bin/format.dart

@@ -304,19 +304,14 @@ abstract class FormatChecker {
 /// 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.allFiles,
+    super.messageCallback,
   }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
-          repoDir: repoDir,
           srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
         ) {
     /*late*/ String clangOs;
     if (Platform.isLinux) {
@@ -449,19 +444,14 @@ 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.allFiles,
+    super.messageCallback,
   }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
-          repoDir: repoDir,
           srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
         ) {
     googleJavaFormatJar = File(
       path.absolute(
@@ -596,19 +586,14 @@ 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,
+    required super.srcDir,
+    super.allFiles,
+    super.messageCallback,
   }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
         ) {
     gnBinary = File(
       path.join(
@@ -687,19 +672,14 @@ class GnFormatChecker extends FormatChecker {
 /// 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,
+    required super.srcDir,
+    super.allFiles,
+    super.messageCallback,
   }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
         ) {
     yapfBin = File(path.join(
       repoDir.absolute.path,
@@ -787,20 +767,13 @@ 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,
+    required super.srcDir,
+    super.allFiles,
+    super.messageCallback,
+  });
 
   @override
   Future<bool> checkFormatting() async {

ci/builders/linux_web_engine.json

@@ -14,15 +14,17 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Linux"
+                "os=Linux",
+		"cores=32"
             ],
             "gclient_variables": {
                 "download_android_deps": false,
                 "download_emsdk": true
             },
             "gn": [
                 "--web",
-                "--runtime-mode=release"
+                "--runtime-mode=release",
+		"--no-goma"
             ],
             "name": "wasm_release",
             "ninja": {

ci/builders/windows_android_aot_engine.json

@@ -11,7 +11,10 @@
                     "name": "android_profile"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
             "gn": [
                 "--runtime-mode",
                 "profile",
@@ -36,7 +39,10 @@
                     "name": "android_profile_arm64"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
             "gn": [
                 "--runtime-mode",
                 "profile",
@@ -62,7 +68,10 @@
                     "name": "android_profile_x64"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
             "gn": [
                 "--runtime-mode",
                 "profile",
@@ -88,7 +97,10 @@
                     "name": "android_release"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
             "gn": [
                 "--runtime-mode",
                 "release",
@@ -113,7 +125,10 @@
                     "name": "android_release_arm64"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
             "gn": [
                 "--runtime-mode",
                 "release",
@@ -139,7 +154,10 @@
                     "name": "android_release_x64"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
             "gn": [
                 "--runtime-mode",
                 "release",

ci/licenses_golden/excluded_files

@@ -154,6 +154,7 @@
 ../../../flutter/impeller/tessellator/tessellator_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
@@ -2747,6 +2748,7 @@
 ../../../third_party/skia/src/encode/BUILD.bazel
 ../../../third_party/skia/src/fonts/BUILD.bazel
 ../../../third_party/skia/src/gpu/BUILD.bazel
+../../../third_party/skia/src/gpu/dawn/BUILD.bazel
 ../../../third_party/skia/src/gpu/ganesh/BUILD.bazel
 ../../../third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel
 ../../../third_party/skia/src/gpu/ganesh/dawn/BUILD.bazel

ci/licenses_golden/licenses_flutter

@@ -1123,6 +1123,8 @@ ORIGIN: ../../../flutter/impeller/entity/contents/color_source_contents.cc + ../
 ORIGIN: ../../../flutter/impeller/entity/contents/color_source_contents.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/color_source_text_contents.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/color_source_text_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
@@ -1237,6 +1239,8 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag + ../../.
 ORIGIN: ../../../flutter/impeller/entity/shaders/border_mask_blur.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/gaussian_blur.frag + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur.glsl + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur.vert + ../../../flutter/LICENSE
@@ -3652,6 +3656,8 @@ FILE: ../../../flutter/impeller/entity/contents/color_source_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/color_source_contents.h
 FILE: ../../../flutter/impeller/entity/contents/color_source_text_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/color_source_text_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
@@ -3766,6 +3772,8 @@ FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag
 FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.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/conical_gradient_fill.frag
+FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.frag
 FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.glsl
 FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.vert