3 files changed, 4 insertions, 12 deletions
diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp
index 213db4e4ff..27b986ca50 100644
--- a/src/shaders/gradients/SkGradientShader.cpp
+++ b/src/shaders/gradients/SkGradientShader.cpp
@@ -378,7 +378,7 @@ bool SkGradientShaderBase::onAppendStages(SkRasterPipeline* p,
     SkRasterPipeline_<256> tPipeline;
     SkRasterPipeline_<256> postPipeline;
     if (!this->adjustMatrixAndAppendStages(alloc, &matrix, &tPipeline, &postPipeline)) {
-        return this->INHERITED::onAppendStages(p, dstCS, alloc, ctm, paint, localM);
+        return false;
     }
 
     p->append(SkRasterPipeline::seed_shader);
diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h
index 6e6e7df074..47ef70c5b0 100644
--- a/src/shaders/gradients/SkGradientShaderPriv.h
+++ b/src/shaders/gradients/SkGradientShaderPriv.h
@@ -240,9 +240,7 @@ protected:
     virtual bool adjustMatrixAndAppendStages(SkArenaAlloc* alloc,
                                              SkMatrix* matrix,
                                              SkRasterPipeline* tPipeline,
-                                             SkRasterPipeline* postPipeline) const {
-        return false;
-    }
+                                             SkRasterPipeline* postPipeline) const = 0;
 
     template <typename T, typename... Args>
     static Context* CheckedMakeContext(SkArenaAlloc* alloc, Args&&... args) {
diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp
index 0496aea33d..08ce2db813 100644
--- a/src/shaders/gradients/SkLinearGradient.cpp
+++ b/src/shaders/gradients/SkLinearGradient.cpp
@@ -79,17 +79,11 @@ SkShaderBase::Context* SkLinearGradient::onMakeBurstPipelineContext(
                            : nullptr;
 }
 
-bool SkLinearGradient::adjustMatrixAndAppendStages(SkArenaAlloc* alloc,
+bool SkLinearGradient::adjustMatrixAndAppendStages(SkArenaAlloc*,
                                                    SkMatrix* matrix,
-                                                   SkRasterPipeline* p,
+                                                   SkRasterPipeline*,
                                                    SkRasterPipeline*) const {
     *matrix = SkMatrix::Concat(fPtsToUnit, *matrix);
-    // If the gradient is less than a quarter of a pixel, this falls into the
-    // subpixel gradient code handled on a different path.
-    SkVector dx = matrix->mapVector(1, 0);
-    if (dx.fX >= 4) {
-        return false;
-    }
     return true;
 }