commit 9faf9fdee9c589544814898ea12ba3e8935dd06e
author Mike Klein <mtklein@google.com> Thu Aug 09 10:04:38 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 09 14:34:11 2018 +0000
tree 62972827fd9ba5331507a2f23242d8e93963802b
parent eb7e5299beffa92d6d26c80e5621c1933914257c

clean up SK_LEGACY_COLORSPACE_XFORMER_IMPL

Change-Id: Ie4e1f9141847705afd1a11e57bc41a9b2019517a
Reviewed-on: https://skia-review.googlesource.com/146520
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/core/SkColorSpaceXformer.cpp

diff --git a/src/core/SkColorSpaceXformer.cpp b/src/core/SkColorSpaceXformer.cpp
index e2a45f5..4c97c1d 100644
--- a/src/core/SkColorSpaceXformer.cpp
+++ b/src/core/SkColorSpaceXformer.cpp
@@ -17,41 +17,23 @@
 #include "SkImagePriv.h"
 #include "SkShaderBase.h"
 
-#ifdef SK_LEGACY_COLORSPACE_XFORMER_IMPL
-    SkColorSpaceXformer::SkColorSpaceXformer(sk_sp<SkColorSpace> dst,
-                                             std::unique_ptr<SkColorSpaceXform> fromSRGB)
-        : fDst(std::move(dst))
-        , fFromSRGB(std::move(fromSRGB))
-        , fReentryCount(0) {}
-#else
-    SkColorSpaceXformer::SkColorSpaceXformer(sk_sp<SkColorSpace> dst)
-        : fDst(std::move(dst))
-        , fFromSRGBSteps(SkColorSpaceXformSteps::UnpremulToUnpremul(sk_srgb_singleton(),
-                                                                    fDst.get()))
-        , fReentryCount(0) {
+SkColorSpaceXformer::SkColorSpaceXformer(sk_sp<SkColorSpace> dst)
+    : fDst(std::move(dst))
+    , fFromSRGBSteps(SkColorSpaceXformSteps::UnpremulToUnpremul(sk_srgb_singleton(),
+                                                                fDst.get()))
+    , fReentryCount(0) {
 
-        SkRasterPipeline p(&fAlloc);
-        p.append(SkRasterPipeline::load_bgra, &fFromSRGBSrc);
-        fFromSRGBSteps.apply(&p);
-        p.append(SkRasterPipeline::store_bgra, &fFromSRGBDst);
-        fFromSRGB = p.compile();
-    }
-#endif
+    SkRasterPipeline p(&fAlloc);
+    p.append(SkRasterPipeline::load_bgra, &fFromSRGBSrc);
+    fFromSRGBSteps.apply(&p);
+    p.append(SkRasterPipeline::store_bgra, &fFromSRGBDst);
+    fFromSRGB = p.compile();
+}
 
 SkColorSpaceXformer::~SkColorSpaceXformer() {}
 
 std::unique_ptr<SkColorSpaceXformer> SkColorSpaceXformer::Make(sk_sp<SkColorSpace> dst) {
-#ifdef SK_LEGACY_COLORSPACE_XFORMER_IMPL
-    std::unique_ptr<SkColorSpaceXform> fromSRGB = SkMakeColorSpaceXform(
-            sk_srgb_singleton(), dst.get());
-
-    return fromSRGB
-        ? std::unique_ptr<SkColorSpaceXformer>(new SkColorSpaceXformer(std::move(dst),
-                                                                       std::move(fromSRGB)))
-        : nullptr;
-#else
     return std::unique_ptr<SkColorSpaceXformer>(new SkColorSpaceXformer{std::move(dst)});
-#endif
 }
 
 // So what's up with these caches?
@@ -157,15 +139,9 @@
 }
 
 void SkColorSpaceXformer::apply(SkColor* xformed, const SkColor* srgb, int n) {
-#ifdef SK_LEGACY_COLORSPACE_XFORMER_IMPL
-    SkAssertResult(fFromSRGB->apply(SkColorSpaceXform::kBGRA_8888_ColorFormat, xformed,
-                                    SkColorSpaceXform::kBGRA_8888_ColorFormat, srgb,
-                                    n, kUnpremul_SkAlphaType));
-#else
     fFromSRGBSrc.pixels = const_cast<SkColor*>(srgb);
     fFromSRGBDst.pixels = xformed;
     fFromSRGB(0,0,n,1);
-#endif
 }
 
 SkColor SkColorSpaceXformer::apply(SkColor srgb) {