AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of remove SK_SUPPORT_LEGACY_PATHOP_ENUMS (patchset #1 id:1 of https://codereview.chromium.org/1200323005/)

Browse Source 
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:

Review URL: https://codereview.chromium.org/1203983003
This commit is contained in:
scroggo 2015-06-24 08:05:52 -07:00 committed by Commit bot
parent cba99b88fd
commit ba9a4aa855
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/pathops/SkPathOps.h
View File

@ -15,6 +15,11 @@ class SkPath;
struct SkRect;
// FIXME: remove this once the define in src/skia/SkUserConfig.h lands
#ifndef SK_SUPPORT_LEGACY_PATHOP_ENUMS
#define SK_SUPPORT_LEGACY_PATHOP_ENUMS
#endif
// FIXME: move everything below into the SkPath class
/**
* The logical operations that can be performed when combining two paths.
@ -25,6 +30,14 @@ enum SkPathOp {
kUnion_SkPathOp, //!< union (inclusive-or) the two paths
kXOR_SkPathOp, //!< exclusive-or the two paths
kReverseDifference_SkPathOp, //!< subtract the first path from the op path
#ifdef SK_SUPPORT_LEGACY_PATHOP_ENUMS
kDifference_PathOp = 0, //!< subtract the op path from the first path
kIntersect_PathOp, //!< intersect the two paths
kUnion_PathOp, //!< union (inclusive-or) the two paths
kXOR_PathOp, //!< exclusive-or the two paths
kReverseDifference_PathOp, //!< subtract the first path from the op path
#endif
};
/** Set this path to the result of applying the Op to this path and the

12
src/pdf/SkPDFDevice.cpp
View File

@ -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_SkPathOp, outPath);
return Op(clipPath, invPath, kIntersect_PathOp, 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_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) {