diff options
Diffstat (limited to 'gm/simpleaaclip.cpp')
| -rw-r--r-- | gm/simpleaaclip.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp index 9a8fe61eaa..72a590f8a3 100644 --- a/gm/simpleaaclip.cpp +++ b/gm/simpleaaclip.cpp @@ -67,7 +67,7 @@ protected: INHERITED::setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); } - void buildRgn(SkAAClip* clip, SkCanvas::ClipOp op) { + void buildRgn(SkAAClip* clip, SkClipOp op) { clip->setPath(fBasePath, nullptr, true); SkAAClip clip2; @@ -85,7 +85,7 @@ protected: canvas->drawRect(fRect, paint); } - void drawRgnOped(SkCanvas* canvas, SkCanvas::ClipOp op, SkColor color) { + void drawRgnOped(SkCanvas* canvas, SkClipOp op, SkColor color) { SkAAClip clip; @@ -97,7 +97,7 @@ protected: paint_rgn(canvas, clip, paint); } - void drawPathsOped(SkCanvas* canvas, SkCanvas::ClipOp op, SkColor color) { + void drawPathsOped(SkCanvas* canvas, SkClipOp op, SkColor color) { this->drawOrig(canvas); @@ -144,14 +144,14 @@ protected: const struct { SkColor fColor; const char* fName; - SkCanvas::ClipOp fOp; + SkClipOp fOp; } gOps[] = { - { SK_ColorBLACK, "Difference", SkCanvas::kDifference_Op }, - { SK_ColorRED, "Intersect", SkCanvas::kIntersect_Op }, - { sk_tool_utils::color_to_565(0xFF008800), "Union", SkCanvas::kUnion_Op }, - { SK_ColorGREEN, "Rev Diff", SkCanvas::kReverseDifference_Op }, - { SK_ColorYELLOW, "Replace", SkCanvas::kReplace_Op }, - { SK_ColorBLUE, "XOR", SkCanvas::kXOR_Op }, + { SK_ColorBLACK, "Difference", kDifference_SkClipOp }, + { SK_ColorRED, "Intersect", kIntersect_SkClipOp }, + { sk_tool_utils::color_to_565(0xFF008800), "Union", kUnion_SkClipOp }, + { SK_ColorGREEN, "Rev Diff", kReverseDifference_SkClipOp }, + { SK_ColorYELLOW, "Replace", kReplace_SkClipOp }, + { SK_ColorBLUE, "XOR", kXOR_SkClipOp }, }; SkPaint textPaint; |