diff options
| author |  Brian Osman <brianosman@google.com> | 2016-10-24 09:24:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-24 14:02:27 +0000 |
| commit | 526972ecb5411b84ba2f5e20252f178f9ee2151f (patch) | |
| tree | ef89b6a40fcdf90ae8e0b00b8f7d247510e03656 /tests/ImageIsOpaqueTest.cpp | |
| parent | 09732a6b0e7c4b087279095762f9d27a4f556aba (diff) | |
Rename all color space factories from New* to Make*
Matches our naming convention for all other types - factories that
return sk_sp (or any type that intelligently manages its own
lifetime) are named Make.
Previous factories are still around, assuming
SK_SUPPORT_LEGACY_COLOR_SPACE_FACTORIES is defined. Enable that
define for Android, etc.
See also: https://codereview.chromium.org/2442053002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3822
Change-Id: Iaea9376490736b494e8ffc820831f052bbe1478d
Reviewed-on: https://skia-review.googlesource.com/3822
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/ImageIsOpaqueTest.cpp')
| -rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 4389a3d892..ab995c8140 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -40,18 +40,18 @@ static void test_flatten(skiatest::Reporter* reporter, const SkImageInfo& info) DEF_TEST(ImageInfo_flattening, reporter) { sk_sp<SkData> data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); - sk_sp<SkColorSpace> space0 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp<SkColorSpace> space0 = SkColorSpace::MakeICC(data->data(), data->size()); data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); - sk_sp<SkColorSpace> space1 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp<SkColorSpace> space1 = SkColorSpace::MakeICC(data->data(), data->size()); data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); - sk_sp<SkColorSpace> space2 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp<SkColorSpace> space2 = SkColorSpace::MakeICC(data->data(), data->size()); data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); - sk_sp<SkColorSpace> space3 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp<SkColorSpace> space3 = SkColorSpace::MakeICC(data->data(), data->size()); sk_sp<SkColorSpace> spaces[] = { nullptr, - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named), - SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named), + SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named), + SkColorSpace::MakeNamed(SkColorSpace::kAdobeRGB_Named), space0, space1, space2, |