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

Revert "Fix int overflow issues with clip and path bounds, take 2."

Browse Source 
This reverts commit 430ad1f206.

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>
This commit is contained in:
Jim Van Verth 2017-11-02 18:52:32 +00:00 committed by Skia Commit-Bot
parent 9d96df1f1f
commit e3a700522f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/GrClip.h
View File

@ -74,8 +74,8 @@ public:
*/
template <typename TRect>
constexpr static bool IsInsideClip(const TRect& innerClipBounds, const SkRect& queryBounds) {
return innerClipBounds.fRight > innerClipBounds.fLeft + kBoundsTolerance &&
innerClipBounds.fBottom > innerClipBounds.fTop + kBoundsTolerance &&
return innerClipBounds.fRight - innerClipBounds.fLeft > kBoundsTolerance &&
innerClipBounds.fBottom - innerClipBounds.fTop > kBoundsTolerance &&
innerClipBounds.fLeft < queryBounds.fLeft + kBoundsTolerance &&
innerClipBounds.fTop < queryBounds.fTop + kBoundsTolerance &&
innerClipBounds.fRight > queryBounds.fRight - kBoundsTolerance &&

5
src/gpu/GrSoftwarePathRenderer.cpp
View File

@ -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;
}