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/complexclip.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/complexclip.cpp')
-rw-r--r-- | gm/complexclip.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index 2ae6a087c6..2f8fa3d325 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -86,14 +86,14 @@ protected: paint.setTextSize(SkIntToScalar(20)); constexpr struct { - SkClipOp fOp; + SkCanvas::ClipOp fOp; const char* fName; } gOps[] = { //extra spaces in names for measureText - {kIntersect_SkClipOp, "Isect "}, - {kDifference_SkClipOp, "Diff " }, - {kUnion_SkClipOp, "Union "}, - {kXOR_SkClipOp, "Xor " }, - {kReverseDifference_SkClipOp, "RDiff "} + {SkCanvas::kIntersect_Op, "Isect "}, + {SkCanvas::kDifference_Op, "Diff " }, + {SkCanvas::kUnion_Op, "Union "}, + {SkCanvas::kXOR_Op, "Xor " }, + {SkCanvas::kReverseDifference_Op, "RDiff "} }; canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); |