Have SkPicture::willPlayBackBitmaps() count SkImages too.

tests/PictureTest.cpp

Index: tests/PictureTest.cpp
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 2afb0dd73d1ebe5762a76ed4f40986e355768730..ce14213e820aed0067fd33bb00a6ef6d73b75070 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -48,6 +48,21 @@ static void make_bm(SkBitmap* bm, int w, int h, SkColor color, bool immutable) {
     }
 }
 
+// For a while willPlayBackBitmaps() ignored SkImages and just looked for SkBitmaps.
+static void test_images_are_found_by_willPlayBackBitmaps(skiatest::Reporter* reporter) {
+    // We just need _some_ SkImage.
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(SkBitmap()));

[f(malita), 2015/08/26 14:56:00]

I was kinda surprised that this works: we never instantiate zero-sized images =>
we're drawing a null image below.

I guess the member detector doesn't care, and in practice I think we're
discarding null images earlier.  So likely not worth filtering.

[mtklein, 2015/08/26 15:13:56]

Yeah, I was just sort of looking for the simplest thing that worked.  I also
thought this might be _too_ simple, but hey, it works.

You're right.  The real key is that we record a DrawImage struct into the
SkRecord.

+
+    SkPictureRecorder recorder;
+    {
+        auto canvas = recorder.beginRecording(100,100);
+        canvas->drawImage(image, 0,0);
+    }
+    SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+
+    REPORTER_ASSERT(reporter, picture->willPlayBackBitmaps());
+}
+
 /* Hit a few SkPicture::Analysis cases not handled elsewhere. */
 static void test_analysis(skiatest::Reporter* reporter) {
     SkPictureRecorder recorder;
@@ -1149,6 +1164,7 @@ DEF_TEST(Picture, reporter) {
     test_gpu_veto(reporter);
 #endif
     test_has_text(reporter);
+    test_images_are_found_by_willPlayBackBitmaps(reporter);
     test_analysis(reporter);
     test_bitmap_with_encoded_data(reporter);
     test_clip_bound_opt(reporter);