Merge branch 'main' into skwasm_image

Author: eyebrowsoffire

.ci.yaml

@@ -262,17 +262,23 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_fuchsia
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_arm_host_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       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
+    dimensions:
+      os: "Linux"
     properties:
       release_build: "true"
       config_name: linux_host_engine
@@ -283,26 +289,31 @@ targets:
     properties:
       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
     properties:
       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
     properties:
       release_build: "true"
       config_name: linux_android_debug_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_license
     recipe: engine_v2/builder
     timeout: 60
     properties:
-      release_build: "true"
       config_name: linux_license
       clobber: "true"
 
@@ -312,12 +323,13 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_web_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
-      release_build: "true"
       config_name: linux_unopt
 
   - name: Linux Web Framework tests
@@ -375,7 +387,10 @@ targets:
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
+      release_build: "true"
       config_name: mac_android_aot_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
@@ -409,6 +424,8 @@ targets:
         ]
       $flutter/osx_sdk : >-
         { "sdk_version": "14e222b" }
+    drone_dimensions:
+      - os=Mac-12
 
   - name: Linux mac_unopt
     recipe: engine_v2/engine_v2
@@ -494,13 +511,14 @@ targets:
         [
           {"dependency": "jazzy", "version": "0.14.1"}
         ]
+    drone_dimensions:
+      - os=Mac-12
 
   - name: Mac impeller-cmake-example
     bringup: true
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
-      release_build: "true"
       cpu: arm64
       config_name: mac_impeller_cmake_example
 
@@ -529,13 +547,17 @@ targets:
     properties:
       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
     properties:
       release_build: "true"
       config_name: windows_host_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_arm_host_engine
     recipe: engine_v2/engine_v2
@@ -546,6 +568,8 @@ targets:
     properties:
       release_build: "true"
       config_name: windows_arm_host_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_unopt
     recipe: engine_v2/builder

.github/workflows/mirror.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Mirror action step
         id: mirror
-        uses: google/mirror-branch-action@c6b07e441a7ffc5ae15860c1d0a8107a3a151db8
+        uses: google/mirror-branch-action@30c52ee21f5d3bd7fb28b95501c11aae7f17eebb
         with:
           github-token: ${{ secrets.FLUTTERMIRRORINGBOT_TOKEN }}
           source: 'main'

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': '1c00432c2a85dd409145aef99b37ff834b985178',
+  'skia_revision': '9b0e912a1cb9dfd34b8982336295f7eaa4d6563d',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,7 +53,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': '005648f027a3242ba2e14c0ee339f09fbad90c47',
+  'dart_revision': 'd2b2ac8298424f04f547a72e8aabde27206cbe05',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -255,7 +255,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '05ec9f7124191c7ba354521f3ffd34b09af872e7',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'b1e6e81b568b633f05cb9ac4afb465013b774a80',
 
    # Fuchsia compatibility
    #
@@ -881,7 +881,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'wxolyLvEWZ9IMOCU_UAzasjFznqX9nwjSnnmcvExiOIC'
+        'version': 'N4LwCRxg0oIevhQ_OAtrHsdzFjvIzDp3XHf1VT-3N90C'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -891,7 +891,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'mAQy_vMru3cTWSoBlVa97StetsvWvJfyzgMpmC0FZB8C'
+        'version': 'D_EOM3rJ8AMk3-WexatyJMtC-gqcf7EEO6BThUEP6CQC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 2e46d52340de215bcd536586cc7c06df
+Signature: 8a685a547b0472dacff6aa912e273c85
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: fc6dcf958ef333159814135f1e066c55
+Signature: bb6600b0cd62920a0e689a68c325634e
 
 ====================================================================================================
 LIBRARY: etc1
@@ -8006,8 +8006,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.h + ../../../third_party
 ORIGIN: ../../../third_party/skia/src/sksl/SkSLProgramKind.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLLayout.cpp + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLLayout.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/dsl/priv/DSL_priv.h + ../../../third_party/skia/LICENSE
@@ -8046,8 +8044,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLPosition.h
 FILE: ../../../third_party/skia/src/sksl/SkSLProgramKind.h
 FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp
 FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLLayout.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLLayout.h
 FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
 FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h
 FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSL_priv.h
@@ -9036,6 +9032,7 @@ ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.c
 ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp + ../../../third_party/skia/LICENSE
@@ -9147,6 +9144,7 @@ FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp
 FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp
 FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp
 FILE: ../../../third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp
+FILE: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp
 FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp
 FILE: ../../../third_party/skia/src/sksl/tracing/SkSLTraceHook.h
 FILE: ../../../third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp

display_list/benchmarking/dl_complexity_unittests.cc

@@ -423,7 +423,7 @@ TEST(DisplayListComplexity, DrawAtlas) {
   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;

display_list/display_list.cc

@@ -22,7 +22,8 @@ DisplayList::DisplayList()
       unique_id_(0),
       bounds_({0, 0, 0, 0}),
       can_apply_group_opacity_(true),
-      is_ui_thread_safe_(true) {}
+      is_ui_thread_safe_(true),
+      affects_transparent_surface_(false) {}
 
 DisplayList::DisplayList(DisplayListStorage&& storage,
                          size_t byte_count,
@@ -32,6 +33,7 @@ DisplayList::DisplayList(DisplayListStorage&& storage,
                          const SkRect& bounds,
                          bool can_apply_group_opacity,
                          bool is_ui_thread_safe,
+                         bool affects_transparent_surface,
                          sk_sp<const DlRTree> rtree)
     : storage_(std::move(storage)),
       byte_count_(byte_count),
@@ -42,6 +44,7 @@ DisplayList::DisplayList(DisplayListStorage&& storage,
       bounds_(bounds),
       can_apply_group_opacity_(can_apply_group_opacity),
       is_ui_thread_safe_(is_ui_thread_safe),
+      affects_transparent_surface_(affects_transparent_surface),
       rtree_(std::move(rtree)) {}
 
 DisplayList::~DisplayList() {

display_list/display_list.h

@@ -263,6 +263,9 @@ class DisplayList : public SkRefCnt {
   }
 
   bool can_apply_group_opacity() const { return can_apply_group_opacity_; }
+  bool affects_transparent_surface() const {
+    return affects_transparent_surface_;
+  }
   bool isUIThreadSafe() const { return is_ui_thread_safe_; }
 
  private:
@@ -274,6 +277,7 @@ class DisplayList : public SkRefCnt {
               const SkRect& bounds,
               bool can_apply_group_opacity,
               bool is_ui_thread_safe,
+              bool affects_transparent_surface,
               sk_sp<const DlRTree> rtree);
 
   static uint32_t next_unique_id();
@@ -292,6 +296,8 @@ class DisplayList : public SkRefCnt {
 
   const bool can_apply_group_opacity_;
   const bool is_ui_thread_safe_;
+  const bool affects_transparent_surface_;
+
   const sk_sp<const DlRTree> rtree_;
 
   void Dispatch(DlOpReceiver& ctx,