aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/pathops
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-06-23 22:05:19 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-23 22:05:19 -0700
commit8bcc7a00febd737f7e82513bd5e4a697526626de (patch)
tree5c3f00c2a7bc56d96cfd01301a6581cd45bbfff0 /include/pathops
parentaf4b233d461647f58de1a7dfd380eec7a7c07117 (diff)
remove SK_SUPPORT_LEGACY_PATHOP_ENUMS
BUG=skia: TBR= Review URL: https://codereview.chromium.org/1200323005
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