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/SkGradientShader.cpp

diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp
index c9a69e2..e2989e6 100644
--- a/src/shaders/gradients/SkGradientShader.cpp
+++ b/src/shaders/gradients/SkGradientShader.cpp
@@ -374,16 +374,13 @@
     if (!this->computeTotalInverse(ctm, localM, &matrix)) {
         return false;
     }
+    matrix.postConcat(fPtsToUnit);
 
-    SkRasterPipeline_<256> tPipeline;
     SkRasterPipeline_<256> postPipeline;
-    if (!this->adjustMatrixAndAppendStages(alloc, &matrix, &tPipeline, &postPipeline)) {
-        return false;
-    }
 
     p->append(SkRasterPipeline::seed_shader);
     p->append_matrix(alloc, matrix);
-    p->extend(tPipeline);
+    this->appendGradientStages(alloc, p, &postPipeline);
 
     switch(fTileMode) {
         case kMirror_TileMode: p->append(SkRasterPipeline::mirror_x_1); break;