diff options
| -rw-r--r-- | include/pathops/SkPathOps.h | 13 | ||||
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 12 |
2 files changed, 6 insertions, 19 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 diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 6d946125e1..d044900ae3 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -345,7 +345,7 @@ static bool calculate_inverse_path(const SkRect& bounds, const SkPath& invPath, SkPath clipPath; clipPath.addRect(bounds); - return Op(clipPath, invPath, kIntersect_PathOp, outPath); + return Op(clipPath, invPath, kIntersect_SkPathOp, outPath); } #ifdef SK_PDF_USE_PATHOPS_CLIPPING @@ -353,16 +353,16 @@ static bool calculate_inverse_path(const SkRect& bounds, const SkPath& invPath, // enums so region_op_to_pathops_op can do a straight passthrough cast. // If these are failing, it may be necessary to make region_op_to_pathops_op // do more. -SK_COMPILE_ASSERT(SkRegion::kDifference_Op == (int)kDifference_PathOp, +SK_COMPILE_ASSERT(SkRegion::kDifference_Op == (int)kDifference_SkPathOp, region_pathop_mismatch); -SK_COMPILE_ASSERT(SkRegion::kIntersect_Op == (int)kIntersect_PathOp, +SK_COMPILE_ASSERT(SkRegion::kIntersect_Op == (int)kIntersect_SkPathOp, region_pathop_mismatch); -SK_COMPILE_ASSERT(SkRegion::kUnion_Op == (int)kUnion_PathOp, +SK_COMPILE_ASSERT(SkRegion::kUnion_Op == (int)kUnion_SkPathOp, region_pathop_mismatch); -SK_COMPILE_ASSERT(SkRegion::kXOR_Op == (int)kXOR_PathOp, +SK_COMPILE_ASSERT(SkRegion::kXOR_Op == (int)kXOR_SkPathOp, region_pathop_mismatch); SK_COMPILE_ASSERT(SkRegion::kReverseDifference_Op == - (int)kReverseDifference_PathOp, + (int)kReverseDifference_SkPathOp, region_pathop_mismatch); static SkPathOp region_op_to_pathops_op(SkRegion::Op op) { |