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

Unified Diff: src/pdf/SkPDFDevice.cpp

Issue 2355483002: abstract name of clipping ops, to transtion to a more restricted set (Closed)
Patch Set: no need for ifdef for globals Created 4 years, 3 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 | « src/pdf/SkPDFCanvas.cpp ('k') | src/pipe/SkPipeCanvas.h » ('j') | 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 0e54bfd76503f5308c7455df34fe635d77494d1a..5299d70d0e38f6770bc085b053485391b1240596 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -176,9 +176,9 @@ static_assert(SkRegion::kXOR_Op == (int)kXOR_SkPathOp, "region_pathop_mismatch")
static_assert(SkRegion::kReverseDifference_Op == (int)kReverseDifference_SkPathOp,
"region_pathop_mismatch");
-static SkPathOp region_op_to_pathops_op(SkRegion::Op op) {
+static SkPathOp region_op_to_pathops_op(SkCanvas::ClipOp op) {
SkASSERT(op >= 0);
- SkASSERT(op <= SkRegion::kReverseDifference_Op);
+ SkASSERT(op <= SkCanvas::kReverseDifference_Op);
return (SkPathOp)op;
}
@@ -209,7 +209,7 @@ static bool get_clip_stack_path(const SkMatrix& transform,
}
entryPath.transform(transform);
- if (SkRegion::kReplace_Op == clipEntry->getOp()) {
+ if (SkCanvas::kReplace_Op == clipEntry->getOp()) {
*outClipPath = entryPath;
} else {
SkPathOp op = region_op_to_pathops_op(clipEntry->getOp());
@@ -1753,7 +1753,7 @@ SkPDFDevice::ContentEntry* SkPDFDevice::setUpContentEntry(const SkClipStack* cli
synthesizedClipStack = fExistingClipStack;
SkPath clipPath;
clipRegion.getBoundaryPath(&clipPath);
- synthesizedClipStack.clipDevPath(clipPath, SkRegion::kReplace_Op,
+ synthesizedClipStack.clipDevPath(clipPath, SkCanvas::kReplace_Op,
false);
clipStack = &synthesizedClipStack;
}
« no previous file with comments | « src/pdf/SkPDFCanvas.cpp ('k') | src/pipe/SkPipeCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698