From d2fd9e9f4f236d57eab9ea3f5b4b23032fe39fd5 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 15 Jun 2016 15:39:13 -0700 Subject: Revert of Keep SkColorSpace and SkColorProfileType in sync (patchset #2 id:20001 of https://codereview.chromium.org/2068743003/ ) Reason for revert: breaking roll. ../../third_party/skia/include/core/SkImageInfo.h:202: error: undefined reference to 'SkColorSpace::NewNamed(SkColorSpace::Named)' Original issue's description: > Keep SkColorSpace and SkColorProfileType in sync > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2068743003 > > Committed: https://skia.googlesource.com/skia/+/04d35bd80dde7cace866781037cbbdcab14ab683 TBR=reed@google.com,brianosman@google.com,herb@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2073593002 --- tests/ImageIsOpaqueTest.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests/ImageIsOpaqueTest.cpp') diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 51229bfce3..52d3b97c52 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -31,10 +31,7 @@ static void test_flatten(skiatest::Reporter* reporter, const SkImageInfo& info) info2.unflatten(rb); REPORTER_ASSERT(reporter, rb.offset() == wb.bytesWritten()); - - // FIXME (msarett): - // Support flatten/unflatten of SkColorSpace objects. - REPORTER_ASSERT(reporter, info.makeColorSpace(nullptr) == info2.makeColorSpace(nullptr)); + REPORTER_ASSERT(reporter, info == info2); } DEF_TEST(ImageInfo_flattening, reporter) { -- cgit v1.2.3