diff options
| author |  egdaniel <egdaniel@google.com> | 2016-06-15 15:39:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-15 15:39:13 -0700 |
| commit | d2fd9e9f4f236d57eab9ea3f5b4b23032fe39fd5 (patch) | |
| tree | f28787ac35aab3a3b2cb3c868267ca0e58797d6b | |
| parent | 4132de7069b0088665af52ffea3a42b055f51b79 (diff) | |
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
| -rw-r--r-- | include/core/SkImageInfo.h | 12 | ||||
| -rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 5 |
2 files changed, 4 insertions, 13 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index c0e0be13f9..2be04ff5a7 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -198,9 +198,7 @@ public: static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at, SkColorProfileType pt = kLinear_SkColorProfileType) { - sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ? - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr; - return SkImageInfo(width, height, ct, at, pt, cs); + return SkImageInfo(width, height, ct, at, pt, nullptr); } static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at, @@ -211,9 +209,7 @@ public: */ static SkImageInfo MakeN32(int width, int height, SkAlphaType at, SkColorProfileType pt = kLinear_SkColorProfileType) { - sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ? - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr; - return SkImageInfo(width, height, kN32_SkColorType, at, pt, cs); + return SkImageInfo(width, height, kN32_SkColorType, at, pt, nullptr); } /** @@ -221,9 +217,7 @@ public: */ static SkImageInfo MakeN32Premul(int width, int height, SkColorProfileType pt = kLinear_SkColorProfileType) { - sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ? - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr; - return SkImageInfo(width, height, kN32_SkColorType, kPremul_SkAlphaType, pt, cs); + return SkImageInfo(width, height, kN32_SkColorType, kPremul_SkAlphaType, pt, nullptr); } /** 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) { |