diff options
| author |  reed <reed@google.com> | 2015-06-26 10:23:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-26 10:23:07 -0700 |
| commit | cdb42bb55c3bdbbd6682dcd50b5c77322bb6e565 (patch) | |
| tree | 4d27e1b97e3189a514965d2ddfeaa7ee67df6040 /src/pdf/SkPDFDevice.cpp | |
| parent | 3bf9206ada256277a39988c263f0379d544fc27b (diff) | |
Revert of Revert of remove SK_SUPPORT_LEGACY_PATHOP_ENUMS (patchset #1 id:1 of https://codereview.chromium.org/1203983003/)
Reason for revert:
fixes have landed in android
Original issue's description:
> Revert of remove SK_SUPPORT_LEGACY_PATHOP_ENUMS (patchset #1 id:1 of https://codereview.chromium.org/1200323005/)
>
> Reason for revert:
> Breaking the Android build.
>
> Original issue's description:
> > remove SK_SUPPORT_LEGACY_PATHOP_ENUMS
> >
> > BUG=skia:
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/8bcc7a00febd737f7e82513bd5e4a697526626de
>
> TBR=reed@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ba9a4aa8550c982c480d03cb6ba2cabaf6209b41
TBR=scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1218523002
Diffstat (limited to 'src/pdf/SkPDFDevice.cpp')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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) { |