Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: src/pdf/SkPDFDevice.cpp

Issue 1218523002: Revert of Revert of remove SK_SUPPORT_LEGACY_PATHOP_ENUMS (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/pathops/SkPathOps.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pdf/SkPDFDevice.cpp
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 6d946125e13bbeb18019edf383eeb2c77808254a..d044900ae377ce826c74c121e647db084547ed58 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_PathOp, outPath);
+ return Op(clipPath, invPath, kIntersect_SkPathOp, 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_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) {
« no previous file with comments | « include/pathops/SkPathOps.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698