commit e8827d254f48ce12df8cd280df3e427170519f47
author Brian Osman <brianosman@google.com> Tue Feb 07 12:31:02 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 07 18:28:37 2017 +0000
tree a826be60d181dc637f75407672fcb299727f61b9
parent 76fff8661f6c3a9133ac9903e0e6d515234598ce

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>

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 500efef..67ddd6c 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -484,38 +484,44 @@
         }
     };
 
-    SkColorSpace* legacyColorSpace = nullptr;
-    for (auto factory : imageFactories) {
-        sk_sp<SkImage> image(factory());
-        if (!image) {
-            ERRORF(reporter, "Error creating image.");
-            continue;
-        }
-        GrTexture* origTexture = as_IB(image)->peekTexture();
+    sk_sp<SkColorSpace> dstColorSpaces[] ={
+        nullptr,
+        SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named),
+    };
 
-        sk_sp<SkImage> texImage(image->makeTextureImage(context, legacyColorSpace));
-        if (!texImage) {
-            // We execpt to fail if image comes from a different GrContext.
-            if (!origTexture || origTexture->getContext() == context) {
-                ERRORF(reporter, "makeTextureImage failed.");
+    for (auto& dstColorSpace : dstColorSpaces) {
+        for (auto factory : imageFactories) {
+            sk_sp<SkImage> image(factory());
+            if (!image) {
+                ERRORF(reporter, "Error creating image.");
+                continue;
             }
-            continue;
-        }
-        GrTexture* copyTexture = as_IB(texImage)->peekTexture();
-        if (!copyTexture) {
-            ERRORF(reporter, "makeTextureImage returned non-texture image.");
-            continue;
-        }
-        if (origTexture) {
-            if (origTexture != copyTexture) {
-                ERRORF(reporter, "makeTextureImage made unnecessary texture copy.");
+            GrTexture* origTexture = as_IB(image)->peekTexture();
+
+            sk_sp<SkImage> texImage(image->makeTextureImage(context, dstColorSpace.get()));
+            if (!texImage) {
+                // We execpt to fail if image comes from a different GrContext.
+                if (!origTexture || origTexture->getContext() == context) {
+                    ERRORF(reporter, "makeTextureImage failed.");
+                }
+                continue;
             }
-        }
-        if (image->width() != texImage->width() || image->height() != texImage->height()) {
-            ERRORF(reporter, "makeTextureImage changed the image size.");
-        }
-        if (image->alphaType() != texImage->alphaType()) {
-            ERRORF(reporter, "makeTextureImage changed image alpha type.");
+            GrTexture* copyTexture = as_IB(texImage)->peekTexture();
+            if (!copyTexture) {
+                ERRORF(reporter, "makeTextureImage returned non-texture image.");
+                continue;
+            }
+            if (origTexture) {
+                if (origTexture != copyTexture) {
+                    ERRORF(reporter, "makeTextureImage made unnecessary texture copy.");
+                }
+            }
+            if (image->width() != texImage->width() || image->height() != texImage->height()) {
+                ERRORF(reporter, "makeTextureImage changed the image size.");
+            }
+            if (image->alphaType() != texImage->alphaType()) {
+                ERRORF(reporter, "makeTextureImage changed image alpha type.");
+            }
         }
     }
 }