Implement SkPicture::hasText() for SkRecord backend.

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxHierarchy.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
@@ skipping 970 matching lines @@
             REPORTER_ASSERT(reporter, info4.fCTM.isIdentity());
             REPORTER_ASSERT(reporter, NULL == info4.fPaint);     // paint is/was uncopyable
             REPORTER_ASSERT(reporter, !info4.fIsNested && !info4.fHasNestedLayers);
     #endif
         }
     }
 }
 
 #endif
 
-static void test_has_text(skiatest::Reporter* reporter) {
+static void test_has_text(skiatest::Reporter* reporter, bool useNewPath) {
     SkPictureRecorder recorder;
-    SkPaint paint;
-    paint.setColor(SK_ColorBLUE);
-    SkPoint point = SkPoint::Make(10, 10);
+#define BEGIN_RECORDING useNewPath ? recorder.EXPERIMENTAL_beginRecording(100, 100) \
+                                   : recorder.             beginRecording(100, 100)
 
-    SkCanvas* canvas = recorder.beginRecording(100, 100);
+    SkCanvas* canvas = BEGIN_RECORDING;
     {
-        canvas->drawRect(SkRect::MakeWH(20, 20), paint);
+        canvas->drawRect(SkRect::MakeWH(20, 20), SkPaint());
     }
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
     REPORTER_ASSERT(reporter, !picture->hasText());
 
-    canvas = recorder.beginRecording(100, 100);
+    SkPoint point = SkPoint::Make(10, 10);
+    canvas = BEGIN_RECORDING;
     {
-        canvas->drawText("Q", 1, point.fX, point.fY, paint);
+        canvas->drawText("Q", 1, point.fX, point.fY, SkPaint());
     }
     picture.reset(recorder.endRecording());
     REPORTER_ASSERT(reporter, picture->hasText());
 
-    canvas = recorder.beginRecording(100, 100);
+    canvas = BEGIN_RECORDING;
     {
-        canvas->drawPosText("Q", 1, &point, paint);
+        canvas->drawPosText("Q", 1, &point, SkPaint());
     }
     picture.reset(recorder.endRecording());
     REPORTER_ASSERT(reporter, picture->hasText());
 
-    canvas = recorder.beginRecording(100, 100);
+    canvas = BEGIN_RECORDING;
     {
-        canvas->drawPosTextH("Q", 1, &point.fX, point.fY, paint);
+        canvas->drawPosTextH("Q", 1, &point.fX, point.fY, SkPaint());
     }
     picture.reset(recorder.endRecording());
     REPORTER_ASSERT(reporter, picture->hasText());
 
-    canvas = recorder.beginRecording(100, 100);
+    canvas = BEGIN_RECORDING;
     {
         SkPath path;
         path.moveTo(0, 0);
         path.lineTo(50, 50);
 
-        canvas->drawTextOnPathHV("Q", 1, path, point.fX, point.fY, paint);
+        canvas->drawTextOnPathHV("Q", 1, path, point.fX, point.fY, SkPaint());
     }
     picture.reset(recorder.endRecording());
     REPORTER_ASSERT(reporter, picture->hasText());
 
-    canvas = recorder.beginRecording(100, 100);
+    canvas = BEGIN_RECORDING;
     {
         SkPath path;
         path.moveTo(0, 0);
         path.lineTo(50, 50);
 
-        canvas->drawTextOnPath("Q", 1, path, NULL, paint);
+        canvas->drawTextOnPath("Q", 1, path, NULL, SkPaint());
     }
     picture.reset(recorder.endRecording());
     REPORTER_ASSERT(reporter, picture->hasText());
+#undef BEGIN_RECORDING
 }
 
 static void set_canvas_to_save_count_4(SkCanvas* canvas) {
     canvas->restoreToCount(1);
     canvas->save();
     canvas->save();
     canvas->save();
 }
 
 /**
@@ skipping 625 matching lines @@
     test_serializing_empty_picture();
 #else
     test_bad_bitmap();
 #endif
     test_unbalanced_save_restores(reporter);
     test_peephole();
 #if SK_SUPPORT_GPU
     test_gpu_veto(reporter, false);
     test_gpu_veto(reporter, true);
 #endif
-    test_has_text(reporter);
+    test_has_text(reporter, false);
+    test_has_text(reporter, true);
     test_analysis(reporter, false);
     test_analysis(reporter, true);
     test_gatherpixelrefs(reporter);
     test_gatherpixelrefsandrects(reporter);
     test_bitmap_with_encoded_data(reporter);
     test_draw_empty(reporter);
     test_clip_bound_opt(reporter);
     test_clip_expansion(reporter);
     test_hierarchical(reporter);
     test_gen_id(reporter);
@@ skipping 125 matching lines @@
     SkAutoTUnref<const SkPicture> picture(recorder.endRecording());
 
     SkCanvas big(640, 480), small(300, 200);
 
     picture->draw(&big);
     REPORTER_ASSERT(r, bbh.searchCalls == 0);
 
     picture->draw(&small);
     REPORTER_ASSERT(r, bbh.searchCalls == 1);
 }