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 --- src/gpu/GrTestUtils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gpu/GrTestUtils.cpp') diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp index a0a35ccf74..20f92f0bb3 100644 --- a/src/gpu/GrTestUtils.cpp +++ b/src/gpu/GrTestUtils.cpp @@ -299,8 +299,8 @@ sk_sp TestColorSpace(SkRandom* random) { // No color space (legacy mode) gColorSpaces[0] = nullptr; // sRGB or Adobe - gColorSpaces[1] = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); - gColorSpaces[2] = SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named); + gColorSpaces[1] = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); + gColorSpaces[2] = SkColorSpace::MakeNamed(SkColorSpace::kAdobeRGB_Named); } return gColorSpaces[random->nextULessThan(static_cast(SK_ARRAY_COUNT(gColorSpaces)))]; } @@ -310,8 +310,8 @@ sk_sp TestColorXform(SkRandom* random) { static bool gOnce; if (!gOnce) { gOnce = true; - sk_sp srgb = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); - sk_sp adobe = SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named); + sk_sp srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); + sk_sp adobe = SkColorSpace::MakeNamed(SkColorSpace::kAdobeRGB_Named); // No gamut change gXforms[0] = nullptr; // To larger gamut -- cgit v1.2.3