commit 22cada0a3826faaa8bdcc66c8debe55374d60170
author Mike Reed <reed@google.com> Mon Aug 09 10:46:33 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Aug 09 17:43:37 2021 +0000
tree a610a56c3139dfdf6389932a13d6eb58949feab6
parent 49914e5813addc95dcd2f92ff87f70a592502c94

Clean up unflattening paints

Attempting reland after breaking G3
-- fixed by updating layerdrawlooper

Change-Id: I9013baae4ff2acad2040741ba53188d616f2920c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437679
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

src/effects/SkLayerDrawLooper.cpp

diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp
index b898c06..63a5639 100644
--- a/src/effects/SkLayerDrawLooper.cpp
+++ b/src/effects/SkLayerDrawLooper.cpp
@@ -231,7 +231,7 @@
         info.fColorMode = (SkBlendMode)buffer.readInt();
         buffer.readPoint(&info.fOffset);
         info.fPostTranslate = buffer.readBool();
-        buffer.readPaint(builder.addLayerOnTop(info), nullptr);
+        *builder.addLayerOnTop(info) = buffer.readPaint();
         if (!buffer.isValid()) {
             return nullptr;
         }