aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPathPriv.h
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2018-05-11 17:19:32 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-11 17:19:37 +0000
commitb8f0709aac43cfdefdbf3a307f8c2ecfc0c55d27 (patch)
treecaef9b5ce1f8f63b192551c6122f2c1baadbc1eb /src/core/SkPathPriv.h
parent1b17adb0f8bb19445aa66754a5dce9629f7ac560 (diff)
Revert "reject large paths to avoid potential float overflows"
This reverts commit b35002d323134e2a441ce2f912a305cd9b3bd321. Reason for revert: crashing in threadedraster, may need to clean up the initonce payload if I early exit Original change's description: > reject large paths to avoid potential float overflows > > I think this change can catch a host of potential fuzzer issues up-front, > rather than adding finite tests in lots and lots of places down-stream. > > Bug: oss-fuzz:8131 > Change-Id: I421aa72c6ca3df57b40dd32b805d6c847d8e8d29 > Reviewed-on: https://skia-review.googlesource.com/127388 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> TBR=mtklein@google.com,jvanverth@google.com,bsalomon@google.com,caryclark@google.com,csmartdalton@google.com,fmalita@chromium.org,liyuqian@google.com,reed@google.com Change-Id: I12ff8664113ba5a36ee91cbe2000d7d445d4bc7e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: oss-fuzz:8131 Reviewed-on: https://skia-review.googlesource.com/127580 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkPathPriv.h')
-rw-r--r--src/core/SkPathPriv.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/core/SkPathPriv.h b/src/core/SkPathPriv.h
index 9190962962..3ee1f83d06 100644
--- a/src/core/SkPathPriv.h
+++ b/src/core/SkPathPriv.h
@@ -222,28 +222,6 @@ public:
static bool IsBadForDAA(const SkPath& path) { return path.fIsBadForDAA; }
static void SetIsBadForDAA(SkPath& path, bool isBadForDAA) { path.fIsBadForDAA = isBadForDAA; }
- /**
- * Sometimes in the drawing pipeline, we have to perform math on path coordinates, even after
- * the path is in device-coordinates. Tessellation and clipping are two examples. Usually this
- * is pretty modest, but it can involve subtracting/adding coordinates, or multiplying by
- * small constants (e.g. 2,3,4). To try to preflight issues where these optionations could turn
- * finite path values into infinities (or NaNs), we allow the upper drawing code to reject
- * the path if its bounds (in device coordinates) is too close to max float.
- */
- static bool TooBigForMath(const SkRect& bounds) {
- // This value is just a guess. smaller is safer, but we don't want to reject largish paths
- // that we don't have to.
- constexpr SkScalar scale_down_to_allow_for_small_multiplies = 0.25f;
- constexpr SkScalar max = SK_ScalarMax * scale_down_to_allow_for_small_multiplies;
-
- // use ! expression so we return true if bounds contains NaN
- return !(bounds.fLeft >= -max && bounds.fTop >= -max &&
- bounds.fRight <= max && bounds.fBottom <= max);
- }
- static bool TooBigForMath(const SkPath& path) {
- return TooBigForMath(path.getBounds());
- }
-
// Returns number of valid points for each SkPath::Iter verb
static int PtsInIter(unsigned verb) {
static const uint8_t gPtsInVerb[] = {