diff options
author | Mike Reed <reed@google.com> | 2016-12-09 13:14:25 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 13:14:41 +0000 |
commit | a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72 (patch) | |
tree | 9398e074cf0408ba24f739130c062b2bfbe4435e /gm/simpleaaclip.cpp | |
parent | 76073c11040204d51dceb49cbd0b05be8e7fd0a2 (diff) |
Revert "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS"
This reverts commit 8e7432b7f98dd592e529a0c8bb038d73ebfb0478.
Reason for revert: <INSERT REASONING HERE>
external/skia/bench/../tools/android/SkAndroidSDKCanvas.h:103:36: error: C++ requires a type specifier for all declarations
void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override;
Original change's description:
> remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS
>
>
> switch over to SkClipOps now that SK_SUPPORT_LEGACY_CLIP_REGIONOPS is gone
>
> BUG=skia:
>
> Change-Id: Ifdc8b3746d508348a40cc009a4e529a1cb3c405d
> Reviewed-on: https://skia-review.googlesource.com/5714
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
TBR=reed@google.com,reviews@skia.org
BUG=skia:
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: If26ea91d7464615e43c1d3d2f726e337ff56b55c
Reviewed-on: https://skia-review.googlesource.com/5721
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
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 72a590f8a3..9a8fe61eaa 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, SkClipOp op) { + void buildRgn(SkAAClip* clip, SkCanvas::ClipOp op) { clip->setPath(fBasePath, nullptr, true); SkAAClip clip2; @@ -85,7 +85,7 @@ protected: canvas->drawRect(fRect, paint); } - void drawRgnOped(SkCanvas* canvas, SkClipOp op, SkColor color) { + void drawRgnOped(SkCanvas* canvas, SkCanvas::ClipOp op, SkColor color) { SkAAClip clip; @@ -97,7 +97,7 @@ protected: paint_rgn(canvas, clip, paint); } - void drawPathsOped(SkCanvas* canvas, SkClipOp op, SkColor color) { + void drawPathsOped(SkCanvas* canvas, SkCanvas::ClipOp op, SkColor color) { this->drawOrig(canvas); @@ -144,14 +144,14 @@ protected: const struct { SkColor fColor; const char* fName; - SkClipOp fOp; + SkCanvas::ClipOp fOp; } gOps[] = { - { 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 }, + { 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 }, }; SkPaint textPaint; |