From baf06bc89a0ee2ac4033281e7310f6c727faab79 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Fri, 3 Mar 2017 20:27:13 +0000 Subject: 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 --- tools/debugger/SkDebugCanvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/debugger') diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index 522f4edbeb..c9d18eeca4 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -307,7 +307,7 @@ void SkDebugCanvas::drawTo(SkCanvas* originalCanvas, int index, int m) { } if (pathOpsMode) { this->resetClipStackData(); - const SkClipStack* clipStack = nullptr;//HACK filterCanvas.getClipStack(); + const SkClipStack* clipStack = filterCanvas.getClipStack(); SkClipStack::Iter iter(*clipStack, SkClipStack::Iter::kBottom_IterStart); const SkClipStack::Element* element; SkPath devPath; -- cgit v1.2.3