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 /dm | |
| 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 'dm')
| -rw-r--r-- | dm/DM.cpp | 4 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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<SkColorSpace> 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); |