diff options
| author |  reed <reed@google.com> | 2015-06-26 10:23:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-26 10:23:07 -0700 |
| commit | cdb42bb55c3bdbbd6682dcd50b5c77322bb6e565 (patch) | |
| tree | 4d27e1b97e3189a514965d2ddfeaa7ee67df6040 /include/pathops | |
| parent | 3bf9206ada256277a39988c263f0379d544fc27b (diff) | |
Revert of Revert of remove SK_SUPPORT_LEGACY_PATHOP_ENUMS (patchset #1 id:1 of https://codereview.chromium.org/1203983003/)
Reason for revert:
fixes have landed in android
Original issue's description:
> Revert of remove SK_SUPPORT_LEGACY_PATHOP_ENUMS (patchset #1 id:1 of https://codereview.chromium.org/1200323005/)
>
> Reason for revert:
> Breaking the Android build.
>
> Original issue's description:
> > remove SK_SUPPORT_LEGACY_PATHOP_ENUMS
> >
> > BUG=skia:
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/8bcc7a00febd737f7e82513bd5e4a697526626de
>
> TBR=reed@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ba9a4aa8550c982c480d03cb6ba2cabaf6209b41
TBR=scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1218523002
Diffstat (limited to 'include/pathops')
| -rw-r--r-- | include/pathops/SkPathOps.h | 13 |
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 |