Initialize bounds even if the text length is zero.

tests/PaintTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkPath.h"
 #include "SkPaint.h"
@@ skipping 79 matching lines @@
     SkScalar miter = SkMaxScalar(SK_Scalar1, paint.getStrokeMiter());
     SkScalar inset = paint.getStrokeJoin() == SkPaint::kMiter_Join ?
                             SkScalarMul(paint.getStrokeWidth(), miter) :
                             paint.getStrokeWidth();
     maxR.inset(-inset, -inset);
 
     // test that our stroke didn't explode
     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;
+
+    // test that the rect was initialized

[reed1, 2013/03/04 19:11:47]

Might get lucky if 'r' is already empty. Should we explicitly set it to some
non-empty values first?

[djsollen, 2013/03/04 19:47:04]

Done.

+    paint.measureText("", 0, &r, SkFloatToScalar(1.0f));
+    REPORTER_ASSERT(reporter, r.isEmpty());
+
+    r.isetWH(10, 10);
+
+    // test that our 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"
 DEFINE_TESTCLASS("Paint", TestPaintClass, TestPaint)