diff options
| -rw-r--r-- | include/pathops/SkPathOps.h | 13 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp | 8 |
2 files changed, 17 insertions, 4 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 diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 9911b8fb9c..1b50efaa32 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -564,11 +564,11 @@ static const char* gFillTypeStrs[] = { }; static const char* gOpStrs[] = { - "kDifference_SkPathOp", - "kIntersect_SkPathOp", - "kUnion_SkPathOp", + "kDifference_PathOp", + "kIntersect_PathOp", + "kUnion_PathOp", "kXor_PathOp", - "kReverseDifference_SkPathOp", + "kReverseDifference_PathOp", }; static const char kHTML4SpaceIndent[] = " "; |