commit dabe5d3780dee956882c0d65c979ccd09a99ea8f
author reed <reed@google.com> Tue Jun 21 10:28:14 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 21 10:28:14 2016 -0700
tree 21f750ea8c8972806287216490dcd25f603a2b96
parent db197a54b562d92a9da2f849e780aa327e1991ca

update callers to not use SkColorProfileType

Requires https://codereview.chromium.org/2087833002/ to land first.

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

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

tests/ColorSpaceTest.cpp

diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index b06dc64..4b39ab0 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -163,6 +163,5 @@
     }
 
     SkImageInfo info = SkImageInfo::MakeS32(10, 10, kPremul_SkAlphaType);
-    REPORTER_ASSERT(r, kSRGB_SkColorProfileType == info.profileType());
-    REPORTER_ASSERT(r, SkColorSpace::kSRGB_GammaNamed == info.colorSpace()->gammaNamed());
+    REPORTER_ASSERT(r, info.gammaCloseToSRGB());
 }

tests/ImageIsOpaqueTest.cpp

diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 51229bf..42c9f99 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -26,8 +26,7 @@
     SkReadBuffer rb(storage, wb.bytesWritten());
 
     // pick a noisy byte pattern, so we ensure that unflatten sets all of our fields
-    SkImageInfo info2 = SkImageInfo::Make(0xB8, 0xB8, (SkColorType) 0xB8, (SkAlphaType) 0xB8,
-                                          (SkColorProfileType) 0xB8);
+    SkImageInfo info2 = SkImageInfo::Make(0xB8, 0xB8, (SkColorType) 0xB8, (SkAlphaType) 0xB8);
 
     info2.unflatten(rb);
     REPORTER_ASSERT(reporter, rb.offset() == wb.bytesWritten());
@@ -38,13 +37,19 @@
 }
 
 DEF_TEST(ImageInfo_flattening, reporter) {
+    sk_sp<SkColorSpace> spaces[] = {
+        nullptr,
+        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named),
+        SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named),
+    };
+
     for (int ct = 0; ct <= kLastEnum_SkColorType; ++ct) {
         for (int at = 0; at <= kLastEnum_SkAlphaType; ++at) {
-            for (int pt = 0; pt <= kLastEnum_SkColorProfileType; ++pt) {
+            for (auto& cs : spaces) {
                 SkImageInfo info = SkImageInfo::Make(100, 200,
                                                      static_cast<SkColorType>(ct),
                                                      static_cast<SkAlphaType>(at),
-                                                     static_cast<SkColorProfileType>(pt));
+                                                     cs);
                 test_flatten(reporter, info);
             }
         }