aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/PaintTest.cpp
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-04 19:47:42 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-04 19:47:42 +0000
commit46348e21732e64e1a4dcfb5d859e6edafba471ff (patch)
tree54e09071cde784d272ac147ea396b068e6ae144b /tests/PaintTest.cpp
parentd66045ec7d37720309dae4879efc01793c3e746a (diff)
Initialize bounds even if the text length is zero.
Review URL: https://codereview.chromium.org/12387092 git-svn-id: http://skia.googlecode.com/svn/trunk@7964 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PaintTest.cpp')
-rw-r--r--tests/PaintTest.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index ed790764ab..b08f22c082 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -97,12 +97,27 @@ static void regression_cubic(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, maxR.contains(strokeR));
}
+// found and fixed for android: not initializing rect for string's of length 0
+static void regression_measureText(skiatest::Reporter* reporter) {
+
+ SkPaint paint;
+ paint.setTextSize(SkFloatToScalar(12.0f));
+
+ SkRect r;
+ r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
+
+ // test that the rect was reset
+ paint.measureText("", 0, &r, SkFloatToScalar(1.0f));
+ REPORTER_ASSERT(reporter, r.isEmpty());
+}
+
static void TestPaint(skiatest::Reporter* reporter) {
// TODO add general paint tests
test_copy(reporter);
// regression tests
regression_cubic(reporter);
+ regression_measureText(reporter);
}
#include "TestClassDef.h"