diff options
author | reed <reed@google.com> | 2015-03-24 13:55:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-24 13:55:33 -0700 |
commit | 0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f (patch) | |
tree | 994c85a8e418986415175ddccc71adf924df3846 /src/pathops/SkPathOpsRect.cpp | |
parent | 82dec0e16ae10026194ce45b67af931700510450 (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 'src/pathops/SkPathOpsRect.cpp')
-rw-r--r-- | src/pathops/SkPathOpsRect.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/pathops/SkPathOpsRect.cpp b/src/pathops/SkPathOpsRect.cpp index 5dd3d8def5..2ceed32900 100644 --- a/src/pathops/SkPathOpsRect.cpp +++ b/src/pathops/SkPathOpsRect.cpp @@ -9,6 +9,11 @@ #include "SkPathOpsQuad.h" #include "SkPathOpsRect.h" +void SkDRect::setBounds(const SkDLine& line) { + set(line[0]); + add(line[1]); +} + void SkDRect::setBounds(const SkDQuad& quad) { set(quad[0]); add(quad[2]); @@ -25,6 +30,13 @@ void SkDRect::setBounds(const SkDQuad& quad) { } } +void SkDRect::setRawBounds(const SkDQuad& quad) { + set(quad[0]); + for (int x = 1; x < 3; ++x) { + add(quad[x]); + } +} + static bool is_bounded_by_end_points(double a, double b, double c, double d) { return between(a, b, d) && between(a, c, d); } @@ -44,3 +56,10 @@ void SkDRect::setBounds(const SkDCubic& c) { add(c.ptAtT(tValues[x])); } } + +void SkDRect::setRawBounds(const SkDCubic& cubic) { + set(cubic[0]); + for (int x = 1; x < 4; ++x) { + add(cubic[x]); + } +} |