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>

4 files changed, 10 insertions, 9 deletions

diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp
index fe3cdd24b5..11343dc334 100644
--- a/bench/ColorCodecBench.cpp
+++ b/bench/ColorCodecBench.cpp
@@ -92,9 +92,9 @@ void ColorCodecBench::decodeAndXformQCMS() {
 #endif
 
 void ColorCodecBench::xformOnly() {
-    sk_sp<SkColorSpace> srcSpace = SkColorSpace::NewICC(fSrcData->data(), fSrcData->size());
+    sk_sp<SkColorSpace> srcSpace = SkColorSpace::MakeICC(fSrcData->data(), fSrcData->size());
     if (!srcSpace) {
-        srcSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        srcSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
     }
     std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(srcSpace.get(),
                                                                       fDstSpace.get());
@@ -160,8 +160,8 @@ void ColorCodecBench::onDelayedSetup() {
     } else
 #endif
     {
-        fDstSpace = FLAGS_srgb ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) :
-                                 SkColorSpace::NewICC(dstData->data(), dstData->size());
+        fDstSpace = FLAGS_srgb ? SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) :
+                                 SkColorSpace::MakeICC(dstData->data(), dstData->size());
         SkASSERT(fDstSpace);
     }
 
@@ -178,7 +178,7 @@ void ColorCodecBench::onDelayedSetup() {
         float gammas[3] = { 1.8f, 2.0f, 2.5f, };
         SkMatrix44 matrix = SkMatrix44(SkMatrix44::kUninitialized_Constructor);
         matrix.set3x3(0.30f, 0.31f, 0.28f, 0.32f, 0.33f, 0.29f, 0.27f, 0.30f, 0.30f);
-        fDstSpace = SkColorSpace::NewRGB(gammas, matrix);
+        fDstSpace = SkColorSpace::MakeRGB(gammas, matrix);
     }
 
     fDstInfo = fDstInfo.makeColorSpace(fDstSpace);
diff --git a/bench/GrMipMapBench.cpp b/bench/GrMipMapBench.cpp
index 096256c6cc..56b66ced25 100644
--- a/bench/GrMipMapBench.cpp
+++ b/bench/GrMipMapBench.cpp
@@ -36,8 +36,9 @@ protected:
             if (nullptr == context) {
                 return;
             }
+            auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
             SkImageInfo info = SkImageInfo::Make(fW, fH, kN32_SkColorType, kPremul_SkAlphaType,
-                                                 SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named));
+                                                 srgb);
             fSurface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info);
         }
 
diff --git a/bench/SkLinearBitmapPipelineBench.cpp b/bench/SkLinearBitmapPipelineBench.cpp
index ad5cf61882..d669ed9dcd 100644
--- a/bench/SkLinearBitmapPipelineBench.cpp
+++ b/bench/SkLinearBitmapPipelineBench.cpp
@@ -90,7 +90,7 @@ struct CommonBitmapFPBenchmark : public Benchmark {
         sk_ignore_unused_variable(trash);
 
         fInfo = SkImageInfo::MakeN32Premul(width, height, fIsSRGB ?
-                                       SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr);
+                                      SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : nullptr);
     }
 
     bool isSuitableFor(Backend backend) override {
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 6a0fb0445b..37e3f060bc 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -456,10 +456,10 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c
                    kN32_SkColorType, kPremul_SkAlphaType, nullptr)
         CPU_CONFIG(565,  kRaster_Backend,
                    kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr)
-        auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
         CPU_CONFIG(srgb, kRaster_Backend,
                    kN32_SkColorType,  kPremul_SkAlphaType, srgbColorSpace)
-        auto srgbLinearColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named);
+        auto srgbLinearColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
         CPU_CONFIG(f16,  kRaster_Backend,
                    kRGBA_F16_SkColorType, kPremul_SkAlphaType, srgbLinearColorSpace)
     }