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

src/gpu/SkGr.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGr.h"
 
 #include "GrCaps.h"
@@ skipping 833 matching lines @@
 bool SkPaint2GrPaint(GrContext* context, GrRenderTarget* rt, const SkPaint& skPaint,
                      const SkMatrix& viewM, bool constantColor, GrPaint* grPaint) {
     SkShader* shader = skPaint.getShader();
     if (nullptr == shader) {
         return SkPaint2GrPaintNoShader(context, rt, skPaint, SkColor2GrColor(skPaint.getColor()),
                                        constantColor, grPaint);
     }
 
     GrColor paintColor = SkColor2GrColor(skPaint.getColor());
 
-    // Start a new block here in order to preserve our context state after calling
-    // asFragmentProcessor(). Since these calls get passed back to the client, we don't really
-    // want them messing around with the context.
-    {
-        // Allow the shader to modify paintColor and also create an effect to be installed as
-        // the first color effect on the GrPaint.
-        GrFragmentProcessor* fp = nullptr;
-        if (!shader->asFragmentProcessor(context, skPaint, viewM, nullptr, &paintColor,
-                                         grPaint->getProcessorDataManager(), &fp)) {
-            return false;
-        }
-        if (fp) {
-            grPaint->addColorFragmentProcessor(fp)->unref();
-            constantColor = false;
-        }
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(context, viewM, NULL,
+        skPaint.getFilterQuality(), grPaint->getProcessorDataManager());
+    if (!fp) {
+        return false;
     }
+    grPaint->addColorFragmentProcessor(fp)->unref();
+    constantColor = false;
 
     // The grcolor is automatically set when calling asFragmentProcessor.
     // If the shader can be seen as an effect it returns true and adds its effect to the grpaint.
     return SkPaint2GrPaintNoShader(context, rt, skPaint, paintColor, constantColor, grPaint);
 }
 
 SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque) {
 #ifdef SK_DEBUG
     const GrSurfaceDesc& desc = tex->desc();
     SkASSERT(w <= desc.fWidth);
@@ skipping 49 matching lines @@
             SkErrorInternals::SetError( kInvalidPaint_SkError,
                                         "Sorry, I don't understand the filtering "
                                         "mode you asked for.  Falling back to "
                                         "MIPMaps.");
             textureFilterMode = GrTextureParams::kMipMap_FilterMode;
             break;
 
     }
     return textureFilterMode;
 }