commit afbf71dd924c7bb46ccdac49e7408b4b088563ff
author brianosman <brianosman@google.com> Thu Jul 21 07:15:37 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 21 07:15:37 2016 -0700
tree f914dccf3130dc11f0003e1c744ebb9e942a4736
parent 1b93bd1e6eba3d14593490e4e24a34546638c8da

Adding color space to SkSpecialImage

Mostly means that GPU backed special images need to be supplied (and
store) a color space object.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2163343002

Review-Url: https://codereview.chromium.org/2163343002

tests/SpecialImageTest.cpp

diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index d7eb340..ba0eb58 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -187,6 +187,7 @@
     REPORTER_ASSERT(reporter, gpuBacked->uniqueID() == orig->uniqueID());
     REPORTER_ASSERT(reporter, gpuBacked->subset().width() == orig->subset().width() &&
                               gpuBacked->subset().height() == orig->subset().height());
+    REPORTER_ASSERT(reporter, gpuBacked->getColorSpace() == orig->getColorSpace());
 }
 
 // Test out the SkSpecialImage::makeTextureImage entry point
@@ -236,7 +237,7 @@
                                                                 SkIRect::MakeWH(kFullSize,
                                                                                 kFullSize),
                                                                 kNeedNewImageUniqueID_SpecialImage,
-                                                                std::move(texture)));
+                                                                std::move(texture), nullptr));
 
         {
             sk_sp<SkSpecialImage> fromGPU(gpuImage->makeTextureImage(context));
@@ -272,7 +273,7 @@
     sk_sp<SkSpecialImage> fullSImg(SkSpecialImage::MakeFromGpu(
                                                             SkIRect::MakeWH(kFullSize, kFullSize),
                                                             kNeedNewImageUniqueID_SpecialImage,
-                                                            texture));
+                                                            texture, nullptr));
 
     const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize);
 
@@ -280,7 +281,7 @@
         sk_sp<SkSpecialImage> subSImg1(SkSpecialImage::MakeFromGpu(
                                                                subset,
                                                                kNeedNewImageUniqueID_SpecialImage,
-                                                               texture));
+                                                               texture, nullptr));
         test_image(subSImg1, reporter, context, true, kPad, kFullSize);
     }