From 526972ecb5411b84ba2f5e20252f178f9ee2151f Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 24 Oct 2016 09:24:02 -0400 Subject: 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 Reviewed-by: Mike Reed --- tests/ImageIsOpaqueTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/ImageIsOpaqueTest.cpp') 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 data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); - sk_sp space0 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp space0 = SkColorSpace::MakeICC(data->data(), data->size()); data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); - sk_sp space1 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp space1 = SkColorSpace::MakeICC(data->data(), data->size()); data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); - sk_sp space2 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp space2 = SkColorSpace::MakeICC(data->data(), data->size()); data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); - sk_sp space3 = SkColorSpace::NewICC(data->data(), data->size()); + sk_sp space3 = SkColorSpace::MakeICC(data->data(), data->size()); sk_sp 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, -- cgit v1.2.3