aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/pathops
diff options
context:
space:
mode:
authorGravatar schenney <schenney@chromium.org>2015-04-06 09:37:56 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-06 09:37:56 -0700
commit143244e27d95255807d8fa505ce0affef96d1fc8 (patch)
treed7c3c6d5f60013ba0c57984211ca1330fbe0c38f /include/pathops
parent76f5cc6e9e87ff247c3ef1f4b3fb03668db06e2e (diff)
Remove now-redundant SkPathOps enum.
R=caryclark,reed BUG=473772 Review URL: https://codereview.chromium.org/1051113005
Diffstat (limited to 'include/pathops')
-rw-r--r--include/pathops/SkPathOps.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/include/pathops/SkPathOps.h b/include/pathops/SkPathOps.h
index a729e6f124..047588b635 100644
--- a/include/pathops/SkPathOps.h
+++ b/include/pathops/SkPathOps.h
@@ -15,11 +15,6 @@ class SkPath;
struct SkRect;
-// FIXME: remove this once the define in src/skia/SkUserConfig.h lands
-#ifndef SK_SUPPORT_LEGACY_PATHOP_ENUMS
-#define SK_SUPPORT_LEGACY_PATHOP_ENUMS
-#endif
-
// FIXME: move everything below into the SkPath class
/**
* The logical operations that can be performed when combining two paths.
@@ -30,14 +25,6 @@ enum SkPathOp {
kUnion_SkPathOp, //!< union (inclusive-or) the two paths
kXOR_SkPathOp, //!< exclusive-or the two paths
kReverseDifference_SkPathOp, //!< subtract the first path from the op path
-
-#ifdef SK_SUPPORT_LEGACY_PATHOP_ENUMS
- kDifference_PathOp = 0, //!< subtract the op path from the first path
- kIntersect_PathOp, //!< intersect the two paths
- kUnion_PathOp, //!< union (inclusive-or) the two paths
- kXOR_PathOp, //!< exclusive-or the two paths
- kReverseDifference_PathOp, //!< subtract the first path from the op path
-#endif
};
/** Set this path to the result of applying the Op to this path and the