Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*

src/gpu/effects/GrDitherEffect.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDitherEffect.h"
 #include "GrFragmentProcessor.h"
 #include "GrInvariantOutput.h"
@@ skipping 35 matching lines @@
 };
 
 void DitherEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(DitherEffect);
 
-const GrFragmentProcessor* DitherEffect::TestCreate(GrProcessorTestData*) {
+GrFragmentProcessor* DitherEffect::TestCreate(GrProcessorTestData*) {
     return DitherEffect::Create();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 class GLDitherEffect : public GrGLFragmentProcessor {
 public:
     GLDitherEffect(const GrProcessor&);
 
     virtual void emitCode(EmitArgs& args) override;
@@ skipping 28 matching lines @@
 void DitherEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
                                      GrProcessorKeyBuilder* b) const {
     GLDitherEffect::GenKey(*this, caps, b);
 }
 
 GrGLFragmentProcessor* DitherEffect::onCreateGLInstance() const  {
     return new GLDitherEffect(*this);
 }
 
 GrFragmentProcessor* GrDitherEffect::Create() { return DitherEffect::Create(); }