Simplify mask/clip intersection, making sure to explicitly check for an empty mask.
Previously we were only asserting the mask wasn't empty, which isn't necessarily true when we're given pathological float coordinates like +Inf or NaN.
A local run of nanobench --match text_ was not able to show this is faster or slower.
This patch fixed this first Chrome bug on my desktop, and the second is probably a dupe.
BUG=chromium:619378,chromium:613912
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2073873002
Review-Url: https://codereview.chromium.org/2073873002
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index f2da450..bf9bd39 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -11,8 +11,10 @@
#include "SkPaint.h"
#include "SkPoint.h"
#include "SkRect.h"
+#include "SkSurface.h"
#include "SkTypes.h"
#include "Test.h"
+#include <math.h>
static const SkColor bgColor = SK_ColorWHITE;
@@ -111,3 +113,21 @@
}
}
}
+
+// Test drawing text at some unusual coordinates.
+// We measure success by not crashing or asserting.
+DEF_TEST(DrawText_weirdCoordinates, r) {
+ auto surface = SkSurface::MakeRasterN32Premul(10,10);
+ auto canvas = surface->getCanvas();
+
+ SkScalar oddballs[] = { 0.0f, (float)INFINITY, (float)NAN, 34359738368.0f };
+
+ for (auto x : oddballs) {
+ canvas->drawText("a", 1, +x, 0.0f, SkPaint());
+ canvas->drawText("a", 1, -x, 0.0f, SkPaint());
+ }
+ for (auto y : oddballs) {
+ canvas->drawText("a", 1, 0.0f, +y, SkPaint());
+ canvas->drawText("a", 1, 0.0f, -y, SkPaint());
+ }
+}