commit a3b45d4f7db953472df4f11ab1595964b65175f9
author Brian Salomon <bsalomon@google.com> Mon Oct 03 11:36:16 2016 -0400
committer Brian Salomon <bsalomon@google.com> Mon Oct 03 19:32:07 2016 +0000
tree 51526b965f6394e5361e6a90ebef7559c26c14ea
parent 14f984bc6bdb4327c3f577b7ccbc61a710443288

Move clip CTM application to SkRasterClip and SkClipStack

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2866

Change-Id: I914a57d6ba128acc457e12586c99ba6766eb940c
Reviewed-on: https://skia-review.googlesource.com/2866
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

gm/windowrectangles.cpp

diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp
index f1a7356..3928763 100644
--- a/gm/windowrectangles.cpp
+++ b/gm/windowrectangles.cpp
@@ -42,19 +42,21 @@
     canvas->saveLayer(SkRect::Make(kLayerRect), nullptr);
 
     SkClipStack stack;
-    stack.clipDevRect(SkRect::MakeXYWH(370.75, 80.25, 149, 100), SkCanvas::kDifference_Op, false);
-    stack.clipDevRect(SkRect::MakeXYWH(80.25, 420.75, 150, 100), SkCanvas::kDifference_Op, true);
-    stack.clipDevRRect(SkRRect::MakeRectXY(SkRect::MakeXYWH(200, 200, 200, 200), 60, 45),
-                       SkCanvas::kDifference_Op, true);
+    stack.clipRect(SkRect::MakeXYWH(370.75, 80.25, 149, 100), SkMatrix::I(),
+                   SkCanvas::kDifference_Op, false);
+    stack.clipRect(SkRect::MakeXYWH(80.25, 420.75, 150, 100), SkMatrix::I(),
+                   SkCanvas::kDifference_Op, true);
+    stack.clipRRect(SkRRect::MakeRectXY(SkRect::MakeXYWH(200, 200, 200, 200), 60, 45),
+                    SkMatrix::I(), SkCanvas::kDifference_Op, true);
 
     SkRRect nine;
     nine.setNinePatch(SkRect::MakeXYWH(550 - 30.25 - 100, 370.75, 100, 150), 12, 35, 23, 20);
-    stack.clipDevRRect(nine, SkCanvas::kDifference_Op, true);
+    stack.clipRRect(nine, SkMatrix::I(), SkCanvas::kDifference_Op, true);
 
     SkRRect complx;
     SkVector complxRadii[4] = {{6, 4}, {8, 12}, {16, 24}, {48, 32}};
     complx.setRectRadii(SkRect::MakeXYWH(80.25, 80.75, 100, 149), complxRadii);
-    stack.clipDevRRect(complx, SkCanvas::kDifference_Op, false);
+    stack.clipRRect(complx, SkMatrix::I(), SkCanvas::kDifference_Op, false);
 
     this->onCoverClipStack(stack, canvas);