commit 9adc82c73df0ef25b708cae8aa48ef9c39ed4c67
author Mike Reed <reed@google.com> Tue Apr 23 10:28:13 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 23 15:05:06 2019 +0000
tree c237b6be122b7f40273d29e003c482d32a6e801b
parent 7eec3cd688b27944dcf1210e333c155ba24b2bde

Fixes for saveBehind/drawBehind

- fixes bug in device restore (was passing the wrong matrix)
- use drawbehind for the clear, to avoid rounding differences between canvas and gpu

Change-Id: I9c130e38437d8d34242620750f11a6ae7e62ff97
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209801
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index a0c956b..fdc7d59 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1141,11 +1141,7 @@
 
     SkPaint paint;
     paint.setBlendMode(SkBlendMode::kClear);
-    if (localBounds) {
-        this->drawRect(*localBounds, paint);
-    } else {
-        this->drawPaint(paint);
-    }
+    this->drawClippedToSaveBehind(paint);
 }
 
 void SkCanvas::internalRestore() {
@@ -2146,7 +2142,6 @@
     while (iter.next()) {
         SkBaseDevice* dev = iter.fDevice;
 
-        SkMatrix ctm = dev->ctm();
         dev->save();
         // We use clipRegion because it is already defined to operate in dev-space
         // (i.e. ignores the ctm). However, it is going to first translate by -origin,
@@ -2154,7 +2149,7 @@
         SkRegion rgn(bounds.makeOffset(dev->fOrigin.fX, dev->fOrigin.fY));
         dev->clipRegion(rgn, SkClipOp::kIntersect);
         dev->drawPaint(looper.paint());
-        dev->restore(ctm);
+        dev->restore(fMCRec->fMatrix);
     }
 
     LOOPER_END