From e8827d254f48ce12df8cd280df3e427170519f47 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Tue, 7 Feb 2017 12:31:02 -0500
Subject: Address feedback on makeTextureImage

BUG=skia:

Whitespace change in public API.

Change-Id: Iaab7b0ed6b157b1c246eae5f0f0440b0ae4d72ab
Reviewed-on: https://skia-review.googlesource.com/8130
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
---
 gm/image.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gm/image.cpp')

diff --git a/gm/image.cpp b/gm/image.cpp
index 1a4b712491..2b92dfd60e 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -428,11 +428,8 @@ private:
 };
 DEF_GM( return new ScaleGeneratorGM; )
 
-DEF_SIMPLE_GM(new_texture_image, canvas, 225, 60) {
-    GrContext* context = nullptr;
-#if SK_SUPPORT_GPU
-    context = canvas->getGrContext();
-#endif
+DEF_SIMPLE_GM(new_texture_image, canvas, 280, 60) {
+    GrContext* context = canvas->getGrContext();
     if (!context) {
         skiagm::GM::DrawGpuOnlyMessage(canvas);
         return;
@@ -468,6 +465,12 @@ DEF_SIMPLE_GM(new_texture_image, canvas, 225, 60) {
                 sk_tool_utils::EncodeImageToData(bmp, SkEncodedImageFormat::kPNG, 100));
             return SkImage::MakeFromEncoded(std::move(src));
         },
+        // Create YUV encoded image.
+        [bmp] {
+            sk_sp<SkData> src(
+                sk_tool_utils::EncodeImageToData(bmp, SkEncodedImageFormat::kJPEG, 100));
+            return SkImage::MakeFromEncoded(std::move(src));
+        },
         // Create a picture image.
         [render_image] {
             SkPictureRecorder recorder;
@@ -495,10 +498,7 @@ DEF_SIMPLE_GM(new_texture_image, canvas, 225, 60) {
     canvas->translate(kPad, kPad);
     for (auto factory : imageFactories) {
         auto image(factory());
-        if (!image) {
-            continue;
-        }
-        if (context) {
+        if (image) {
             sk_sp<SkImage> texImage(image->makeTextureImage(context,
                                                             canvas->imageInfo().colorSpace()));
             if (texImage) {
-- 
cgit v1.2.3