diff options
Diffstat (limited to 'tools/debugger/SkDebugCanvas.cpp')
-rw-r--r-- | tools/debugger/SkDebugCanvas.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index eaf72c3c35..b02ab59ee8 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -105,7 +105,7 @@ SkDebugCanvas::SkDebugCanvas(int width, int height) SkASSERT(!large.roundOut().isEmpty()); #endif // call the base class' version to avoid adding a draw command - this->INHERITED::onClipRect(large, kReplace_Op, kHard_ClipEdgeStyle); + this->INHERITED::onClipRect(large, kReplace_SkClipOp, kHard_ClipEdgeStyle); } SkDebugCanvas::~SkDebugCanvas() { @@ -153,21 +153,21 @@ class SkDebugClipVisitor : public SkCanvas::ClipVisitor { public: SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {} - void clipRect(const SkRect& r, SkCanvas::ClipOp, bool doAA) override { + void clipRect(const SkRect& r, SkClipOp, bool doAA) override { SkPaint p; p.setColor(SK_ColorRED); p.setStyle(SkPaint::kStroke_Style); p.setAntiAlias(doAA); fCanvas->drawRect(r, p); } - void clipRRect(const SkRRect& rr, SkCanvas::ClipOp, bool doAA) override { + void clipRRect(const SkRRect& rr, SkClipOp, bool doAA) override { SkPaint p; p.setColor(SK_ColorGREEN); p.setStyle(SkPaint::kStroke_Style); p.setAntiAlias(doAA); fCanvas->drawRRect(rr, p); } - void clipPath(const SkPath& path, SkCanvas::ClipOp, bool doAA) override { + void clipPath(const SkPath& path, SkClipOp, bool doAA) override { SkPaint p; p.setColor(SK_ColorBLUE); p.setStyle(SkPaint::kStroke_Style); @@ -220,7 +220,7 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index, int m) { canvas->clear(SK_ColorWHITE); canvas->resetMatrix(); if (!windowRect.isEmpty()) { - canvas->clipRect(windowRect, SkCanvas::kReplace_Op); + canvas->clipRect(windowRect, kReplace_SkClipOp); } this->applyUserTransform(canvas); @@ -280,7 +280,7 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index, int m) { canvas->save(); #define LARGE_COORD 1000000000 canvas->clipRect(SkRect::MakeLTRB(-LARGE_COORD, -LARGE_COORD, LARGE_COORD, LARGE_COORD), - SkCanvas::kReverseDifference_Op); + kReverseDifference_SkClipOp); SkPaint clipPaint; clipPaint.setColor(fClipVizColor); canvas->drawPaint(clipPaint); @@ -295,7 +295,7 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index, int m) { if (!windowRect.isEmpty()) { SkRect r = windowRect; r.outset(SK_Scalar1, SK_Scalar1); - canvas->clipRect(r, SkCanvas::kReplace_Op); + canvas->clipRect(r, kReplace_SkClipOp); } // visualize existing clips SkDebugClipVisitor visitor(canvas); @@ -316,9 +316,9 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index, int m) { if (type != SkClipStack::Element::kEmpty_Type) { element->asPath(&operand); } - SkCanvas::ClipOp elementOp = element->getOp(); + SkClipOp elementOp = element->getOp(); this->addClipStackData(devPath, operand, elementOp); - if (elementOp == SkCanvas::kReplace_Op) { + if (elementOp == kReplace_SkClipOp) { devPath = operand; } else { Op(devPath, operand, (SkPathOp) elementOp, &devPath); @@ -515,19 +515,19 @@ void SkDebugCanvas::overrideTexFiltering(bool overrideTexFiltering, SkFilterQual fFilterQuality = quality; } -void SkDebugCanvas::onClipPath(const SkPath& path, ClipOp op, ClipEdgeStyle edgeStyle) { +void SkDebugCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle edgeStyle) { this->addDrawCommand(new SkClipPathCommand(path, op, kSoft_ClipEdgeStyle == edgeStyle)); } -void SkDebugCanvas::onClipRect(const SkRect& rect, ClipOp op, ClipEdgeStyle edgeStyle) { +void SkDebugCanvas::onClipRect(const SkRect& rect, SkClipOp op, ClipEdgeStyle edgeStyle) { this->addDrawCommand(new SkClipRectCommand(rect, op, kSoft_ClipEdgeStyle == edgeStyle)); } -void SkDebugCanvas::onClipRRect(const SkRRect& rrect, ClipOp op, ClipEdgeStyle edgeStyle) { +void SkDebugCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle edgeStyle) { this->addDrawCommand(new SkClipRRectCommand(rrect, op, kSoft_ClipEdgeStyle == edgeStyle)); } -void SkDebugCanvas::onClipRegion(const SkRegion& region, ClipOp op) { +void SkDebugCanvas::onClipRegion(const SkRegion& region, SkClipOp op) { this->addDrawCommand(new SkClipRegionCommand(region, op)); } @@ -800,8 +800,8 @@ void SkDebugCanvas::addPathData(const SkPath& path, const char* pathName) { } void SkDebugCanvas::addClipStackData(const SkPath& devPath, const SkPath& operand, - SkCanvas::ClipOp elementOp) { - if (elementOp == SkCanvas::kReplace_Op) { + SkClipOp elementOp) { + if (elementOp == kReplace_SkClipOp) { if (!lastClipStackData(devPath)) { fSaveDevPath = operand; } |