aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/pathops
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-03-24 13:55:33 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-24 13:55:33 -0700
commit0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f (patch)
tree994c85a8e418986415175ddccc71adf924df3846 /include/pathops
parent82dec0e16ae10026194ce45b67af931700510450 (diff)
Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/)
Reason for revert: ASAN investigation Original issue's description: > pathops version two > > R=reed@google.com > > marked 'no commit' to attempt to get trybots to run > > TBR=reed@google.com > > Committed: https://skia.googlesource.com/skia/+/ccec0f958ffc71a9986d236bc2eb335cb2111119 TBR=caryclark@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1029993002
Diffstat (limited to 'include/pathops')
-rw-r--r--include/pathops/SkPathOps.h32
1 files changed, 1 insertions, 31 deletions
diff --git a/include/pathops/SkPathOps.h b/include/pathops/SkPathOps.h
index 3ec9351606..ba18f4ba72 100644
--- a/include/pathops/SkPathOps.h
+++ b/include/pathops/SkPathOps.h
@@ -8,8 +8,6 @@
#define SkPathOps_DEFINED
#include "SkPreConfig.h"
-#include "SkTArray.h"
-#include "SkTDArray.h"
class SkPath;
struct SkRect;
@@ -37,10 +35,9 @@ enum SkPathOp {
@param one The first operand (for difference, the minuend)
@param two The second operand (for difference, the subtrahend)
- @param op The operator to apply.
@param result The product of the operands. The result may be one of the
inputs.
- @return True if the operation succeeded.
+ @return True if operation succeeded.
*/
bool SK_API Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result);
@@ -66,31 +63,4 @@ bool SK_API Simplify(const SkPath& path, SkPath* result);
*/
bool SK_API TightBounds(const SkPath& path, SkRect* result);
-/** Perform a series of path operations, optimized for unioning many paths together.
- */
-class SK_API SkOpBuilder {
-public:
- /** Add one or more paths and their operand. The builder is empty before the first
- path is added, so the result of a single add is (emptyPath OP path).
-
- @param path The second operand.
- @param op The operator to apply to the existing and supplied paths.
- */
- void add(const SkPath& path, SkPathOp op);
-
- /** Computes the sum of all paths and operands, and resets the builder to its
- initial state.
-
- @param result The product of the operands.
- @return True if the operation succeeded.
- */
- bool resolve(SkPath* result);
-
-private:
- SkTArray<SkPath> fPathRefs;
- SkTDArray<SkPathOp> fOps;
-
- void reset();
-};
-
#endif