commit 622240688ff99ab21ee970564a5fb99d703900ba
author Mike Klein <mtklein@google.com> Mon May 18 13:09:14 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon May 18 18:50:07 2020 +0000
tree 64e8f25df981b13cd8af449a1f3bbac826134bf6
parent 2ddf7f39dec00c91fdb97919912b0943ab839802

clean up some SK_LEGACY... defines

Change-Id: I86c9f983672e6edd616afe003ea9823da7890511
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290585
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkColorSpaceXformSteps.cpp

diff --git a/src/core/SkColorSpaceXformSteps.cpp b/src/core/SkColorSpaceXformSteps.cpp
index 133d661..8e8a2e1 100644
--- a/src/core/SkColorSpaceXformSteps.cpp
+++ b/src/core/SkColorSpaceXformSteps.cpp
@@ -132,9 +132,6 @@
 }
 
 void SkColorSpaceXformSteps::apply(SkRasterPipeline* p, bool src_is_normalized) const {
-#if defined(SK_LEGACY_SRGB_STAGE_CHOICE)
-    src_is_normalized = true;
-#endif
     if (flags.unpremul) { p->append(SkRasterPipeline::unpremul); }
     if (flags.linearize) {
         if (src_is_normalized && srcTF_is_sRGB) {

src/opts/SkRasterPipeline_opts.h

diff --git a/src/opts/SkRasterPipeline_opts.h b/src/opts/SkRasterPipeline_opts.h
index 7e9558e..339d7a8 100644
--- a/src/opts/SkRasterPipeline_opts.h
+++ b/src/opts/SkRasterPipeline_opts.h
@@ -978,11 +978,7 @@
 }
 
 SI F approx_powf(F x, F y) {
-#if defined(SK_LEGACY_APPROX_POWF_SPECIALCASE)
-    return if_then_else((x == 0)         , 0
-#else
     return if_then_else((x == 0)|(x == 1), x
-#endif
                                          , approx_pow2(approx_log2(x) * y));
 }