AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch to _deprecated suffix for exotic SkClipOps

Browse Source 
BUG=skia:

Change-Id: Ibb0cd0f963c040d9033cd6bcb040c651bca99651
Reviewed-on: https://skia-review.googlesource.com/6206
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Mike Reed 2016-12-20 08:17:36 -05:00 committed by Skia Commit-Bot
parent ace343286d
commit 3711e1185d
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/core/SkClipOp.h
View File

@ -56,13 +56,19 @@ enum class SkClipOp {
// Private Internal enums -- do not use -- destined to be removed at any moment!
kUnion_deprecated = 2,
kXOR_deprecated = 3,
kReverseDifference_deprecated = 4,
kReplace_deprecated = 5,
kUnion_private_internal_do_not_use = 2,
kXOR_private_internal_do_not_use = 3,
kReverseDifference_private_internal_do_not_use = 4,
kReplace_private_internal_do_not_use = 5,
kMax_EnumValue = kReplace_deprecated,
kMax_EnumValue = kReplace_private_internal_do_not_use
#ifdef SK_SUPPORT_LEGACY_CLIPOP_EXOTIC_NAMES
kUnion_private_internal_do_not_use = kUnion_deprecated,
kXOR_private_internal_do_not_use = kXOR_deprecated,
kReverseDifference_private_internal_do_not_use = kReverseDifference_deprecated,
kReplace_private_internal_do_not_use = kReplace_deprecated,
#endif
};
#endif

6
include/core/SkClipStack.h
View File

@ -54,7 +54,7 @@ public:
static const int kTypeCnt = kLastType + 1;
Element() {
this->initCommon(0, SkClipOp::kReplace_private_internal_do_not_use, false);
this->initCommon(0, SkClipOp::kReplace_deprecated, false);
this->setEmpty();
}
@ -226,7 +226,7 @@ public:
int fGenID;
Element(int saveCount) {
this->initCommon(saveCount, SkClipOp::kReplace_private_internal_do_not_use, false);
this->initCommon(saveCount, SkClipOp::kReplace_deprecated, false);
this->setEmpty();
}
@ -516,7 +516,7 @@ private:
void restoreTo(int saveCount);
inline bool hasClipRestriction(SkClipOp op) {
return op >= SkClipOp::kUnion_private_internal_do_not_use && !fClipRestrictionRect.isEmpty();
return op >= SkClipOp::kUnion_deprecated && !fClipRestrictionRect.isEmpty();
}
/**

1
public.bzl
View File

@ -594,6 +594,7 @@ DEFINES_ALL = [
# Temporarily Disable analytic AA for Google3
"SK_NO_ANALYTIC_AA",
"SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",
"SK_SUPPORT_LEGACY_CLIPOP_EXOTIC_NAMES",
]
################################################################################

8
src/core/SkClipOpPriv.h
View File

@ -13,9 +13,9 @@
const SkClipOp kDifference_SkClipOp = SkClipOp::kDifference;
const SkClipOp kIntersect_SkClipOp = SkClipOp::kIntersect;
const SkClipOp kUnion_SkClipOp = SkClipOp::kUnion_private_internal_do_not_use;
const SkClipOp kXOR_SkClipOp = SkClipOp::kXOR_private_internal_do_not_use;
const SkClipOp kReverseDifference_SkClipOp = SkClipOp::kReverseDifference_private_internal_do_not_use;
const SkClipOp kReplace_SkClipOp = SkClipOp::kReplace_private_internal_do_not_use;
const SkClipOp kUnion_SkClipOp = SkClipOp::kUnion_deprecated;
const SkClipOp kXOR_SkClipOp = SkClipOp::kXOR_deprecated;
const SkClipOp kReverseDifference_SkClipOp = SkClipOp::kReverseDifference_deprecated;
const SkClipOp kReplace_SkClipOp = SkClipOp::kReplace_deprecated;
#endif