diff options
| author |  Mike Reed <reed@google.com> | 2017-05-10 14:13:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-10 18:56:14 +0000 |
| commit | 14113bcc4e55ab6029344a46fb70aa6344587409 (patch) | |
| tree | 30585b3821de2ca3a17c526810c6cded9a4c0a62 /src/core/SkClipStack.h | |
| parent | 6f9f2591c1a6a01f0c0fb06fcd77d1429e3ce260 (diff) | |
add flag to hide deprecated clipops
needs this to land first
https://codereview.chromium.org/2877493002/#
Bug: skia:3191
Change-Id: Iff5271064877c4e96353d3564464f513eaad0bb5
Reviewed-on: https://skia-review.googlesource.com/16365
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkClipStack.h')
| -rw-r--r-- | src/core/SkClipStack.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/SkClipStack.h b/src/core/SkClipStack.h index 98cec07af6..4502ecdb5f 100644 --- a/src/core/SkClipStack.h +++ b/src/core/SkClipStack.h @@ -10,6 +10,7 @@ #include "../private/SkMessageBus.h" #include "SkCanvas.h" +#include "SkClipOpPriv.h" #include "SkDeque.h" #include "SkPath.h" #include "SkRRect.h" @@ -57,7 +58,7 @@ public: static const int kTypeCnt = kLastType + 1; Element() { - this->initCommon(0, SkClipOp::kReplace_deprecated, false); + this->initCommon(0, kReplace_SkClipOp, false); this->setEmpty(); } @@ -245,7 +246,7 @@ public: mutable SkTArray<std::unique_ptr<GrUniqueKeyInvalidatedMessage>> fMessages; #endif Element(int saveCount) { - this->initCommon(saveCount, SkClipOp::kReplace_deprecated, false); + this->initCommon(saveCount, kReplace_SkClipOp, false); this->setEmpty(); } @@ -560,7 +561,7 @@ private: void restoreTo(int saveCount); inline bool hasClipRestriction(SkClipOp op) { - return op >= SkClipOp::kUnion_deprecated && !fClipRestrictionRect.isEmpty(); + return op >= kUnion_SkClipOp && !fClipRestrictionRect.isEmpty(); } /** |