From ea4f05486c6113b79a1d539b631fe1ef48f35974 Mon Sep 17 00:00:00 2001
From: JsouLiang <weiguoliang@bytedance.com>
Date: Fri, 19 Aug 2022 18:29:04 +0800
Subject: [PATCH 1/2] Make ShaderMaskLayer code builder aware

---
 flow/layers/shader_mask_layer.cc           | 24 +++++++++++++++-------
 flow/layers/shader_mask_layer_unittests.cc | 13 ++++++------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/flow/layers/shader_mask_layer.cc b/flow/layers/shader_mask_layer.cc
index b7dd47e48d99e..7a1d42116793d 100644
--- a/flow/layers/shader_mask_layer.cc
+++ b/flow/layers/shader_mask_layer.cc
@@ -59,14 +59,24 @@ void ShaderMaskLayer::Paint(PaintContext& context) const {
       context, paint_bounds(), cache_paint.sk_paint());
   PaintChildren(context);
 
-  SkPaint paint;
-  paint.setBlendMode(ToSk(blend_mode_));
-  if (shader_) {
-    paint.setShader(shader_->skia_object());
+  auto shader_rect = SkRect::MakeWH(mask_rect_.width(), mask_rect_.height());
+  if (context.leaf_nodes_builder) {
+    DlPaint dl_paint;
+    dl_paint.setBlendMode(blend_mode_);
+    if (shader_) {
+      dl_paint.setColorSource(shader_.get());
+    }
+    context.leaf_nodes_builder->translate(mask_rect_.left(), mask_rect_.top());
+    context.leaf_nodes_builder->drawRect(shader_rect, dl_paint);
+  } else {
+    SkPaint paint;
+    paint.setBlendMode(ToSk(blend_mode_));
+    if (shader_) {
+      paint.setShader(shader_->skia_object());
+    }
+    context.leaf_nodes_canvas->translate(mask_rect_.left(), mask_rect_.top());
+    context.leaf_nodes_canvas->drawRect(shader_rect, paint);
   }
-  context.leaf_nodes_canvas->translate(mask_rect_.left(), mask_rect_.top());
-  context.leaf_nodes_canvas->drawRect(
-      SkRect::MakeWH(mask_rect_.width(), mask_rect_.height()), paint);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/shader_mask_layer_unittests.cc b/flow/layers/shader_mask_layer_unittests.cc
index 5f6c38b76a0f1..c4f863ac01eaa 100644
--- a/flow/layers/shader_mask_layer_unittests.cc
+++ b/flow/layers/shader_mask_layer_unittests.cc
@@ -373,17 +373,18 @@ TEST_F(ShaderMaskLayerTest, OpacityInheritance) {
     {
       expected_builder.translate(offset.fX, offset.fY);
       /* ShaderMaskLayer::Paint() */ {
-        expected_builder.setColor(opacity_alpha << 24);
-        expected_builder.saveLayer(&child_path.getBounds(), true);
+        DlPaint sl_paint;
+        sl_paint.setColor(opacity_alpha << 24);
+        expected_builder.saveLayer(&child_path.getBounds(), &sl_paint);
         {
           /* child layer paint */ {
-            expected_builder.setColor(0xFF000000);
-            expected_builder.drawPath(child_path);
+            expected_builder.drawPath(child_path,
+                                      DlPaint().setColor(0xFF000000));
           }
           expected_builder.translate(mask_rect.fLeft, mask_rect.fTop);
-          expected_builder.setBlendMode(DlBlendMode::kSrc);
           expected_builder.drawRect(
-              SkRect::MakeWH(mask_rect.width(), mask_rect.height()));
+              SkRect::MakeWH(mask_rect.width(), mask_rect.height()),
+              DlPaint().setBlendMode(DlBlendMode::kSrc));
         }
         expected_builder.restore();
       }

From 876ecd5fba8ed245971d1328a000f132bf894b30 Mon Sep 17 00:00:00 2001
From: JsouLiang <weiguoliang@bytedance.com>
Date: Fri, 19 Aug 2022 18:35:23 +0800
Subject: [PATCH 2/2] DLBuilder saveLayer

---
 flow/layers/shader_mask_layer.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/flow/layers/shader_mask_layer.cc b/flow/layers/shader_mask_layer.cc
index 7a1d42116793d..9a99a807ea2fe 100644
--- a/flow/layers/shader_mask_layer.cc
+++ b/flow/layers/shader_mask_layer.cc
@@ -54,13 +54,13 @@ void ShaderMaskLayer::Paint(PaintContext& context) const {
       return;
     }
   }
-
-  Layer::AutoSaveLayer save = Layer::AutoSaveLayer::Create(
-      context, paint_bounds(), cache_paint.sk_paint());
-  PaintChildren(context);
-
   auto shader_rect = SkRect::MakeWH(mask_rect_.width(), mask_rect_.height());
+
   if (context.leaf_nodes_builder) {
+    context.builder_multiplexer->saveLayer(&paint_bounds(),
+                                           cache_paint.dl_paint());
+    PaintChildren(context);
+
     DlPaint dl_paint;
     dl_paint.setBlendMode(blend_mode_);
     if (shader_) {
@@ -69,6 +69,9 @@ void ShaderMaskLayer::Paint(PaintContext& context) const {
     context.leaf_nodes_builder->translate(mask_rect_.left(), mask_rect_.top());
     context.leaf_nodes_builder->drawRect(shader_rect, dl_paint);
   } else {
+    Layer::AutoSaveLayer save = Layer::AutoSaveLayer::Create(
+        context, paint_bounds(), cache_paint.sk_paint());
+    PaintChildren(context);
     SkPaint paint;
     paint.setBlendMode(ToSk(blend_mode_));
     if (shader_) {