commit c2bd631c431c6ee865b709bd11e26a9bdceaf5cd
author Florin Malita <fmalita@chromium.org> Mon Jul 17 13:46:48 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 17 18:08:59 2017 +0000
tree 31853ea5b6435bff01116bdd37496d3efc55b818
parent ce5ee602ed19b8493bf4dd1654d29486088bad63

Remove (now-dead) SK_LEGACY_SWEEP_GRADIENT code

Reland of https://skia-review.googlesource.com/c/17982

TBR=

Change-Id: If29d60d60a45562715fddfaff56b1e694be13034
Reviewed-on: https://skia-review.googlesource.com/24042
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

src/shaders/gradients/SkSweepGradient.cpp

diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp
index e6bc42c..f984542 100644
--- a/src/shaders/gradients/SkSweepGradient.cpp
+++ b/src/shaders/gradients/SkSweepGradient.cpp
@@ -8,9 +8,6 @@
 #include "SkColorSpaceXformer.h"
 #include "SkSweepGradient.h"
 
-#include <algorithm>
-#include <cmath>
-
 #include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 
@@ -52,68 +49,6 @@
     buffer.writePoint(fCenter);
 }
 
-SkShaderBase::Context* SkSweepGradient::onMakeContext(
-    const ContextRec& rec, SkArenaAlloc* alloc) const
-{
-    return CheckedMakeContext<SweepGradientContext>(alloc, *this, rec);
-}
-
-SkSweepGradient::SweepGradientContext::SweepGradientContext(
-        const SkSweepGradient& shader, const ContextRec& rec)
-    : INHERITED(shader, rec) {}
-
-bool SkSweepGradient::onIsRasterPipelineOnly() const {
-#ifdef SK_LEGACY_SWEEP_GRADIENT
-    return false;
-#else
-    return true;
-#endif
-}
-
-//  returns angle in a circle [0..2PI) -> [0..255]
-static unsigned SkATan2_255(float y, float x) {
-    //    static const float g255Over2PI = 255 / (2 * SK_ScalarPI);
-    static const float g255Over2PI = 40.584510488433314f;
-
-    float result = sk_float_atan2(y, x);
-    if (!SkScalarIsFinite(result)) {
-        return 0;
-    }
-    if (result < 0) {
-        result += 2 * SK_ScalarPI;
-    }
-    SkASSERT(result >= 0);
-    // since our value is always >= 0, we can cast to int, which is faster than
-    // calling floorf()
-    int ir = (int)(result * g255Over2PI);
-    SkASSERT(ir >= 0 && ir <= 255);
-    return ir;
-}
-
-void SkSweepGradient::SweepGradientContext::shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC,
-                                                      int count) {
-    SkMatrix::MapXYProc proc = fDstToIndexProc;
-    const SkMatrix&     matrix = fDstToIndex;
-    const SkPMColor* SK_RESTRICT cache = fCache->getCache32();
-    int                 toggle = init_dither_toggle(x, y);
-    SkPoint             srcPt;
-
-    proc(matrix, SkIntToScalar(x) + SK_ScalarHalf,
-                 SkIntToScalar(y) + SK_ScalarHalf, &srcPt);
-    SkScalar fx = srcPt.fX,
-             fy = srcPt.fY;
-
-    SkScalar dx = matrix.getScaleX(),
-             dy = matrix.getSkewY();
-
-        for (; count > 0; --count) {
-            *dstC++ = cache[toggle + SkATan2_255(fy, fx)];
-            fx += dx;
-            fy += dy;
-            toggle = next_dither_toggle(toggle);
-        }
-}
-
 /////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU

src/shaders/gradients/SkSweepGradient.h

diff --git a/src/shaders/gradients/SkSweepGradient.h b/src/shaders/gradients/SkSweepGradient.h
index f3932d5..00fcc97 100644
--- a/src/shaders/gradients/SkSweepGradient.h
+++ b/src/shaders/gradients/SkSweepGradient.h
@@ -14,16 +14,6 @@
 public:
     SkSweepGradient(SkScalar cx, SkScalar cy, const Descriptor&);
 
-    class SweepGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
-    public:
-        SweepGradientContext(const SkSweepGradient& shader, const ContextRec&);
-
-        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
-
-    private:
-        typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
-    };
-
     GradientType asAGradient(GradientInfo* info) const override;
 
 #if SK_SUPPORT_GPU
@@ -35,7 +25,6 @@
 
 protected:
     void flatten(SkWriteBuffer& buffer) const override;
-    Context* onMakeContext(const ContextRec&, SkArenaAlloc*) const override;
     sk_sp<SkShader> onMakeColorSpace(SkColorSpaceXformer* xformer) const override;
 
     bool adjustMatrixAndAppendStages(SkArenaAlloc* alloc,
@@ -43,7 +32,7 @@
                                      SkRasterPipeline* tPipeline,
                                      SkRasterPipeline* postPipeline) const override;
 
-    bool onIsRasterPipelineOnly() const override;
+    bool onIsRasterPipelineOnly() const override { return true; }
 
 private:
     const SkPoint fCenter;