From ea5e676a7b75600edcde3912886486004ccd7626 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 2 Mar 2017 20:22:35 +0000 Subject: Revert "Remove SkDraw from device-draw methods, and enable device-centric clipping." This reverts commit c77e33f73d3e86cfabf925d6f2e1166f81022575. Reason for revert: breaks isClipRect - this CL inspected the conservative clip for this, which is (by definition) a rect - probably need to query the device for this info Original change's description: > Remove SkDraw from device-draw methods, and enable device-centric clipping. > > BUG=skia:6214 > > Change-Id: I593900724310d09133ae4791ef68d38c43762fc2 > Reviewed-on: https://skia-review.googlesource.com/8806 > Reviewed-by: Brian Salomon > Commit-Queue: Mike Reed > TBR=bsalomon@google.com,halcanary@google.com,msarett@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6214 Change-Id: I9090cbbb9f45b2dd204d9fdc187de2ff714b93f6 Reviewed-on: https://skia-review.googlesource.com/9172 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/LayerDrawLooperTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/LayerDrawLooperTest.cpp') diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp index f3705b77be..2910341be8 100644 --- a/tests/LayerDrawLooperTest.cpp +++ b/tests/LayerDrawLooperTest.cpp @@ -30,9 +30,9 @@ public: FakeDevice() : INHERITED(make_bm(100, 100), SkSurfaceProps(0, kUnknown_SkPixelGeometry)) { } - void drawRect(const SkRect& r, const SkPaint& paint) override { - fLastMatrix = this->ctm(); - this->INHERITED::drawRect(r, paint); + void drawRect(const SkDraw& draw, const SkRect& r, const SkPaint& paint) override { + fLastMatrix = *draw.fMatrix; + this->INHERITED::drawRect(draw, r, paint); } SkMatrix fLastMatrix; -- cgit v1.2.3