commit ac9f090976d80790cc601a6d76b0dc29ca14f500
author Jim Van Verth <jvanverth@google.com> Mon Sep 24 12:24:15 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 24 16:51:18 2018 +0000
tree 547f77e9f0f79276b59216963afba78107870a71
parent dcc85fc61008f61daef4313846bdd62877fd596d

Make sure ReflexHash grid count is reasonable

Bug: chromium:888233
Change-Id: I42bea81d8dc6eee3516ed585f8bb838ef20ce554
Reviewed-on: https://skia-review.googlesource.com/156368
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/utils/SkPolyUtils.cpp

diff --git a/src/utils/SkPolyUtils.cpp b/src/utils/SkPolyUtils.cpp
index 23e7394..1d8bec0 100644
--- a/src/utils/SkPolyUtils.cpp
+++ b/src/utils/SkPolyUtils.cpp
@@ -1440,7 +1440,8 @@
             : fBounds(bounds)
             , fNumVerts(0) {
         // We want vertexCount grid cells, roughly distributed to match the bounds ratio
-        fHCount = SkScalarRoundToInt(SkScalarSqrt(vertexCount*bounds.width()/bounds.height()));
+        SkScalar hCount = SkScalarSqrt(vertexCount*bounds.width()/bounds.height());
+        fHCount = SkTMax(SkTMin(SkScalarRoundToInt(hCount), vertexCount), 1);
         fVCount = vertexCount/fHCount;
         fGridConversion.set((fHCount - 0.001f)/bounds.width(), (fVCount - 0.001f)/bounds.height());
         fGrid.setCount(fHCount*fVCount);