diff options
| author |  reed <reed@google.com> | 2016-09-20 08:42:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-20 08:42:39 -0700 |
| commit | 73603f3c52ffd89fe9d035be827b566a0e7d3b79 (patch) | |
| tree | 873793b81536379196233f313b1a093d02bdac0e /src/pdf/SkPDFDevice.cpp | |
| parent | cae1be5acc8148fc5cbadd8730ee7994e50a1a47 (diff) | |
abstract name of clipping ops, to transtion to a more restricted set
SkRegion::Op --> SkCanvas::ClipOp (alias) --> SkClipOp
pre-CL needed in chrome : https://codereview.chromium.org/2355583002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2355483002
Review-Url: https://codereview.chromium.org/2355483002
Diffstat (limited to 'src/pdf/SkPDFDevice.cpp')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 0e54bfd765..5299d70d0e 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; } |