diff options
| author |  scroggo <scroggo@google.com> | 2015-04-07 06:53:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-07 06:53:21 -0700 |
| commit | 5965b73e54da7746e1dafa7c696a4ddf9bd0f271 (patch) | |
| tree | ee3a33e4fe8bfd518155df92b3a95a7b65a4b61c /include/pathops | |
| parent | fde1c85696656e5ccaa938114751e3f6bab6a90f (diff) | |
Revert of Remove now-redundant SkPathOps enum. (patchset #1 id:1 of https://codereview.chromium.org/1051113005/)
Reason for revert:
Android is still using this. See https://android-build.storage.googleapis.com/builds/git_master-skia-linux-razor-userdebug/1836783/4c2968b94c5f4b238ff5ba61111bf867ea872fd8dce930612f376711883419b8/logs/build_error.log?GoogleAccessId=701025073339-mqn0q2nvir9iurm6q5d00tdv7blbgvjr%40developer.gserviceaccount.com&Signature=ATvg9ZvwZGFDDVb%2B1Ue2WHVGaCCL1hAD7QjXeZv2gBT08I3JaKLcseUhV5K2G%2F%2BWUnsnSgNNjzjBnBLmnPbK9Uu8NC%2B%2F5J0dU3sKD8TU9dvMtkQhFQSp2x5t5Xxf5mczi2EPps%2FwoPHqTKQqrMgqStySzw206W1%2Fc135RrdrgYg%3D&Expires=1428415459
Original issue's description:
> Remove now-redundant SkPathOps enum.
>
> R=caryclark,reed
> BUG=473772
>
> Committed: https://skia.googlesource.com/skia/+/143244e27d95255807d8fa505ce0affef96d1fc8
TBR=caryclark@google.com,reed@google.com,schenney@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473772
Review URL: https://codereview.chromium.org/1068873002
Diffstat (limited to 'include/pathops')
| -rw-r--r-- | include/pathops/SkPathOps.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/pathops/SkPathOps.h b/include/pathops/SkPathOps.h index 047588b635..a729e6f124 100644 --- a/include/pathops/SkPathOps.h +++ b/include/pathops/SkPathOps.h @@ -15,6 +15,11 @@ 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. @@ -25,6 +30,14 @@ 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 |