diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-07 17:06:09 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:06:24 +0000 |
| commit | 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 (patch) | |
| tree | e97779c04ea0d2059cbd6291de3cbfbf27c1cc61 /tests/ImageIsOpaqueTest.cpp | |
| parent | ecaaf6f1c156e5690200322fc2636380c1f63dd8 (diff) | |
Revert "SkColorSpace: remove named API, add gamut API"
This reverts commit ecaaf6f1c156e5690200322fc2636380c1f63dd8.
Reason for revert: Breaks everything
Original change's description:
> SkColorSpace: remove named API, add gamut API
>
> BUG=skia:
>
> Change-Id: I01c5e1874c9a034febc64e25b3aaafb5050393a6
> Reviewed-on: https://skia-review.googlesource.com/8021
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ief5a0a4eeabe75a21f7512e23fc15309151066c4
Reviewed-on: https://skia-review.googlesource.com/8127
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'tests/ImageIsOpaqueTest.cpp')
| -rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 81f1d76609..cbbe331c5b 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -12,7 +12,6 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #endif -#include "SkColorSpace_Base.h" #include "SkImage.h" #include "SkSurface.h" #include "SkReadBuffer.h" @@ -51,8 +50,8 @@ DEF_TEST(ImageInfo_flattening, reporter) { sk_sp<SkColorSpace> spaces[] = { nullptr, - SkColorSpace::MakeSRGB(), - SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named), + SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named), + SkColorSpace::MakeNamed(SkColorSpace::kAdobeRGB_Named), space0, space1, space2, @@ -127,7 +126,7 @@ DEF_TEST(Image_isAlphaOnly, reporter) { GetResourceAsImage("color_wheel.jpg"), SkImage::MakeFromPicture(make_picture(), { 10, 10 }, nullptr, nullptr, SkImage::BitDepth::kU8, - SkColorSpace::MakeSRGB()), + SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)), }) { REPORTER_ASSERT(reporter, image->isAlphaOnly() == false); |