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

src/core/SkPictureShader.h

+
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureShader_DEFINED
 #define SkPictureShader_DEFINED
 
@@ skipping 12 matching lines @@
 public:
     static SkShader* Create(const SkPicture*, TileMode, TileMode, const SkMatrix*,
                                    const SkRect*);
     virtual ~SkPictureShader();
 
     size_t contextSize() const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader)
 
-    bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
-                             GrColor*, GrProcessorDataManager*,
-                             GrFragmentProcessor**) const override;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix& viewM,
+                                                   const SkMatrix*,
+                                                   SkFilterQuality,
+                                                   GrProcessorDataManager*) const override;
+#endif
 
 protected:
     SkPictureShader(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
     Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
     SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix*, const SkRect*);
 
     SkShader* refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix, const int maxTextureSize = 0) const;
@@ skipping 22 matching lines @@
         SkShader::Context*      fBitmapShaderContext;
         void*                   fBitmapShaderContextStorage;
 
         typedef SkShader::Context INHERITED;
     };
 
     typedef SkShader INHERITED;
 };
 
 #endif // SkPictureShader_DEFINED