diff options
author | Jim Van Verth <jvanverth@google.com> | 2017-11-02 18:52:32 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-02 18:52:42 +0000 |
commit | e3a700522f6e088be00011bc98fcdc4a13bd798b (patch) | |
tree | 8d8b6348d6bb874d02085c25bbe10e073b5cc878 /src/gpu/GrSoftwarePathRenderer.cpp | |
parent | 9d96df1f1f5a47a044e31787dbcf7d1b04766816 (diff) |
Revert "Fix int overflow issues with clip and path bounds, take 2."
This reverts commit 430ad1f2065c182746e43e67ca95fb911cc55892.
Reason for revert: Many bad GMs.
Original change's description:
> Fix int overflow issues with clip and path bounds, take 2.
>
> * Change IsInsideClip test to be more int overflow friendly
> * Check to make sure path bounds can have representable width and height
>
> Bug: skia:7239
> Bug: skia:7240
> Change-Id: If8468e46bc74a428c25d466ff3756d0cad385c09
> Reviewed-on: https://skia-review.googlesource.com/66154
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I5b1a651b60340bb4230893ef5f5d2df2ce6fd241
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7239, skia:7240
Reviewed-on: https://skia-review.googlesource.com/67240
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/GrSoftwarePathRenderer.cpp')
-rw-r--r-- | src/gpu/GrSoftwarePathRenderer.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp index ef7fa9078e..4b0f363fee 100644 --- a/src/gpu/GrSoftwarePathRenderer.cpp +++ b/src/gpu/GrSoftwarePathRenderer.cpp @@ -52,11 +52,6 @@ static bool get_unclipped_shape_dev_bounds(const GrShape& shape, const SkMatrix& if (!shapeDevBounds.intersect(SkRect::MakeLTRB(INT32_MIN, INT32_MIN, kMaxInt, kMaxInt))) { return false; } - // Make sure that the resulting SkIRect can have representable width and height - if (SkScalarRoundToInt(shapeDevBounds.width()) > kMaxInt || - SkScalarRoundToInt(shapeDevBounds.height()) > kMaxInt) { - return false; - } shapeDevBounds.roundOut(devBounds); return true; } |