Specify bit depth and color space in SkImage::MakeFromPicture()

BUG=skia:

Change-Id: I1d2a2b1f97557fc3e7ca6c2bdad6329f7760dbd2
Reviewed-on: https://skia-review.googlesource.com/6685
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>

3 files changed, 3 insertions, 1 deletions

diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 21ddb5da48..cbbe331c5b 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -125,6 +125,7 @@ DEF_TEST(Image_isAlphaOnly, reporter) {
         GetResourceAsImage("mandrill_128.png"),
         GetResourceAsImage("color_wheel.jpg"),
         SkImage::MakeFromPicture(make_picture(), { 10, 10 }, nullptr, nullptr,
+                                 SkImage::BitDepth::kU8,
                                  SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)),
     })
     {
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 161dff8853..4f9d944d25 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -130,7 +130,7 @@ static sk_sp<SkImage> create_picture_image() {
     SkCanvas* canvas = recorder.beginRecording(10, 10);
     canvas->clear(SK_ColorCYAN);
     return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(), SkISize::Make(10, 10),
-                                    nullptr, nullptr,
+                                    nullptr, nullptr, SkImage::BitDepth::kU8,
                                     SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named));
 };
 #endif
diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp
index ed2ff74b56..922aceff25 100644
--- a/tests/SkResourceCacheTest.cpp
+++ b/tests/SkResourceCacheTest.cpp
@@ -330,6 +330,7 @@ DEF_TEST(BitmapCache_discarded_image, reporter) {
             canvas->clear(SK_ColorCYAN);
             return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
                                             SkISize::Make(10, 10), nullptr, nullptr,
+                                            SkImage::BitDepth::kU8,
                                             SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named));
         });
     }