Revert "Reduce arbitrary opList splitting when sorting"

This reverts commit 94fee93c9b23bd1a32604753da8bef755d6c8a95.

Reason for revert: Android (and Chromecast) woes

Original change's description:
> Reduce arbitrary opList splitting when sorting
> 
> Change-Id: I49a47672600f72dc46f27462a2c344e77a06a659
> Reviewed-on: https://skia-review.googlesource.com/141243
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: Ic4fd4ab17bb15bef35dcbf852e0f8ad99ee45e8f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/141760
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 6 insertions, 15 deletions

diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
index 6d68292616..9850e605fb 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
@@ -44,15 +44,6 @@ public:
 
     const char* name() const override { return "GaussianConvolution"; }
 
-    SkString dumpInfo() const override {
-        SkString str;
-        str.appendf("dir: %s radius: %d bounds: [%d %d]",
-                    Direction::kX == fDirection ? "X" : "Y",
-                    fRadius,
-                    fBounds[0], fBounds[1]);
-        return str;
-    }
-
     std::unique_ptr<GrFragmentProcessor> clone() const override {
         return std::unique_ptr<GrFragmentProcessor>(
                 new GrGaussianConvolutionFragmentProcessor(*this));
@@ -83,14 +74,14 @@ private:
 
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST
 
-    GrCoordTransform      fCoordTransform;
-    TextureSampler        fTextureSampler;
+    GrCoordTransform fCoordTransform;
+    TextureSampler fTextureSampler;
     // TODO: Inline the kernel constants into the generated shader code. This may involve pulling
     // some of the logic from SkGpuBlurUtils into this class related to radius/sigma calculations.
-    float                 fKernel[kMaxKernelWidth];
-    int                   fBounds[2];
-    int                   fRadius;
-    Direction             fDirection;
+    float fKernel[kMaxKernelWidth];
+    int   fBounds[2];
+    int fRadius;
+    Direction fDirection;
     GrTextureDomain::Mode fMode;
 
     typedef GrFragmentProcessor INHERITED;