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 --- dm/DM.cpp | 4 ++-- dm/DMSrcSink.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dm') diff --git a/dm/DM.cpp b/dm/DM.cpp index f9c831a9a8..31b999dfc8 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -845,8 +845,8 @@ static Sink* create_sink(const SkCommandLineConfig* config) { #endif if (FLAGS_cpu) { - auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); - auto srgbLinearColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); + auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); + auto srgbLinearColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); SINK("565", RasterSink, kRGB_565_SkColorType); SINK("8888", RasterSink, kN32_SkColorType); diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index a38b96ee5a..8ff8b4c055 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -910,9 +910,9 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const { sk_sp dstSpace = nullptr; if (kDst_sRGB_Mode == fMode) { - dstSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + dstSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); } else if (kDst_HPZR30w_Mode == fMode) { - dstSpace = SkColorSpace::NewICC(dstData->data(), dstData->size()); + dstSpace = SkColorSpace::MakeICC(dstData->data(), dstData->size()); } SkImageInfo decodeInfo = codec->getInfo().makeColorType(fColorType).makeColorSpace(dstSpace); -- cgit v1.2.3