commit 50b2084bd15e7aea416dc8c6fd2373864c50f023
author Florin Malita <fmalita@chromium.org> Sat Jul 29 19:08:28 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Jul 30 14:24:21 2017 +0000
tree a68b832e4eb3e9e8cd8c463bccab8b9836cd6fff
parent c25437da5c6a3e5766c7811cfd484c5ef1b2861e

Gradient stages cleanup

Hoist the matrix setup into SkGradientShaderBase.

Drop the bool return for adjustMatrixAndAppendStages(), and rename to
appendGradientStages().

Change-Id: Iad412f638f86223e5af46a7d3dea6f768f52bcad
Reviewed-on: https://skia-review.googlesource.com/26427
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/shaders/gradients/SkTwoPointConicalGradient.cpp

diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
index 6f821a5..0bee74f 100644
--- a/src/shaders/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
@@ -202,12 +202,8 @@
 }
 #endif
 
-bool SkTwoPointConicalGradient::adjustMatrixAndAppendStages(SkArenaAlloc* alloc,
-                                                            SkMatrix* matrix,
-                                                            SkRasterPipeline* p,
-                                                            SkRasterPipeline* postPipeline) const {
-    matrix->postConcat(fPtsToUnit);
-
+void SkTwoPointConicalGradient::appendGradientStages(SkArenaAlloc* alloc, SkRasterPipeline* p,
+                                                     SkRasterPipeline* postPipeline) const {
     const auto dRadius = fRadius2 - fRadius1;
     SkASSERT(dRadius >= 0);
 
@@ -220,8 +216,7 @@
 
         p->append_matrix(alloc, SkMatrix::Concat(SkMatrix::MakeTrans(bias, 0),
                                                  SkMatrix::MakeScale(scale, 1)));
-
-        return true;
+        return;
     }
 
     const auto dCenter = (fCenter1 - fCenter2).length();
@@ -267,6 +262,4 @@
         p->append(SkRasterPipeline::mask_2pt_conical_degenerates, ctx);
         postPipeline->append(SkRasterPipeline::apply_vector_mask, &ctx->fMask);
     }
-
-    return true;
 }