From 025e2444c1f5a0c3cdc0bf60d1fa59941a0b5db4 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 4 Mar 2017 19:43:23 +0000 Subject: Revert "Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""" This reverts commit baf06bc89a0ee2ac4033281e7310f6c727faab79. Reason for revert: reland to diagnose possible g3 failure Original change's description: > Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""" > > This reverts commit cfaa63237b152ae216f1351207bce3ea9808814c. > > Reason for revert: speculative revert to fix Google3 > > Original change's description: > > 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 > > Commit-Queue: Mike Reed > > > > TBR=bsalomon@google.com,reed@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Change-Id: Ibd7ee6383999f008eb6ee59c1c3f1c06a86044ea > Reviewed-on: https://skia-review.googlesource.com/9230 > Reviewed-by: Cary Clark > Commit-Queue: Cary Clark > TBR=bsalomon@google.com,reviews@skia.org,caryclark@google.com,reed@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Change-Id: I093fa8788056be39af01191bbf3a9e5de9f73954 Reviewed-on: https://skia-review.googlesource.com/9244 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 2910341be8..f3705b77be 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 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; -- cgit v1.2.3