commit cfaa63237b152ae216f1351207bce3ea9808814c
author Mike Reed <reed@google.com> Fri Mar 03 13:58:10 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 03 19:39:43 2017 +0000
tree 4812b9bc5f6c8908ec2de778ef31c1447bc181a6
parent b7115c68baef47b88f70b14d408e6cf5fab523f7

Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""

passes new (augmented) CanvasClipType unittest
fixed rasterclipstack::setnewsize

This reverts commit ea5e676a7b75600edcde3912886486004ccd7626.

BUG=skia:

Change-Id: I004653e0f4d01454662f8516fccab0046486f273
Reviewed-on: https://skia-review.googlesource.com/9185
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>

tests/LayerDrawLooperTest.cpp

diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 2910341..f3705b7 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -30,9 +30,9 @@
     FakeDevice() : INHERITED(make_bm(100, 100), SkSurfaceProps(0, kUnknown_SkPixelGeometry)) {
     }
 
-    void drawRect(const SkDraw& draw, const SkRect& r, const SkPaint& paint) override {
-        fLastMatrix = *draw.fMatrix;
-        this->INHERITED::drawRect(draw, r, paint);
+    void drawRect(const SkRect& r, const SkPaint& paint) override {
+        fLastMatrix = this->ctm();
+        this->INHERITED::drawRect(r, paint);
     }
 
     SkMatrix fLastMatrix;