commit 3711e1185d53aa70e56c28b5b6f74ab1590fd865
author Mike Reed <reed@google.com> Tue Dec 20 08:17:36 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 20 13:46:58 2016 +0000
tree c49efe90599a270d52ab562f6a13ff1f9a3f8249
parent ace343286d900446737a027739dafb05c646c417

switch to _deprecated suffix for exotic SkClipOps

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>

include/core/SkClipOp.h

diff --git a/include/core/SkClipOp.h b/include/core/SkClipOp.h
index 3035565..e49ea5b 100644
--- a/include/core/SkClipOp.h
+++ b/include/core/SkClipOp.h
@@ -56,13 +56,19 @@
 
 
     // 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

include/core/SkClipStack.h

diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h
index dce6904..55e0942 100644
--- a/include/core/SkClipStack.h
+++ b/include/core/SkClipStack.h
@@ -54,7 +54,7 @@
         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 @@
         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 @@
     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();
     }
 
     /**

public.bzl

diff --git a/public.bzl b/public.bzl
index 5c2e09f..a87d325 100644
--- a/public.bzl
+++ b/public.bzl
@@ -594,6 +594,7 @@
     # Temporarily Disable analytic AA for Google3
     "SK_NO_ANALYTIC_AA",
     "SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",
+    "SK_SUPPORT_LEGACY_CLIPOP_EXOTIC_NAMES",
 ]
 
 ################################################################################

src/core/SkClipOpPriv.h

diff --git a/src/core/SkClipOpPriv.h b/src/core/SkClipOpPriv.h
index 4af442a..21695b9 100644
--- a/src/core/SkClipOpPriv.h
+++ b/src/core/SkClipOpPriv.h
@@ -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