| Index: src/pdf/SkPDFDevice.cpp
|
| diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
|
| index d044900ae377ce826c74c121e647db084547ed58..6d946125e13bbeb18019edf383eeb2c77808254a 100644
|
| --- a/src/pdf/SkPDFDevice.cpp
|
| +++ b/src/pdf/SkPDFDevice.cpp
|
| @@ -345,7 +345,7 @@
|
| SkPath clipPath;
|
| clipPath.addRect(bounds);
|
|
|
| - return Op(clipPath, invPath, kIntersect_SkPathOp, outPath);
|
| + return Op(clipPath, invPath, kIntersect_PathOp, outPath);
|
| }
|
|
|
| #ifdef SK_PDF_USE_PATHOPS_CLIPPING
|
| @@ -353,16 +353,16 @@
|
| // 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_SkPathOp,
|
| +SK_COMPILE_ASSERT(SkRegion::kDifference_Op == (int)kDifference_PathOp,
|
| region_pathop_mismatch);
|
| -SK_COMPILE_ASSERT(SkRegion::kIntersect_Op == (int)kIntersect_SkPathOp,
|
| +SK_COMPILE_ASSERT(SkRegion::kIntersect_Op == (int)kIntersect_PathOp,
|
| region_pathop_mismatch);
|
| -SK_COMPILE_ASSERT(SkRegion::kUnion_Op == (int)kUnion_SkPathOp,
|
| +SK_COMPILE_ASSERT(SkRegion::kUnion_Op == (int)kUnion_PathOp,
|
| region_pathop_mismatch);
|
| -SK_COMPILE_ASSERT(SkRegion::kXOR_Op == (int)kXOR_SkPathOp,
|
| +SK_COMPILE_ASSERT(SkRegion::kXOR_Op == (int)kXOR_PathOp,
|
| region_pathop_mismatch);
|
| SK_COMPILE_ASSERT(SkRegion::kReverseDifference_Op ==
|
| - (int)kReverseDifference_SkPathOp,
|
| + (int)kReverseDifference_PathOp,
|
| region_pathop_mismatch);
|
|
|
| static SkPathOp region_op_to_pathops_op(SkRegion::Op op) {
|
|
|