more threading of GrShaderDataManager

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1215643006

2 files changed, 5 insertions, 2 deletions

diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index e7f3bd6541..7cbde0e7e8 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -14,6 +14,7 @@
 #include "SkColor.h"
 
 class GrFragmentProcessor;
+class GrShaderDataManager;
 class GrTexture;
 class GrXPFactory;
 class SkString;
@@ -207,7 +208,8 @@ public:
         required. Upon success the function returns true and the caller owns a ref to the fragment
         parameter. Upon failure false is returned and the processor param is not written to.
      */
-    virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture* background) const;
+    virtual bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+                                     GrTexture* background) const;
 
     /** A subclass may implement this factory function to work with the GPU backend. It is legal
         to call this with xpf NULL to simply test the return value. If xpf is non-NULL then the
diff --git a/include/gpu/effects/GrCustomXfermode.h b/include/gpu/effects/GrCustomXfermode.h
index ab131ee169..31c66d5f43 100644
--- a/include/gpu/effects/GrCustomXfermode.h
+++ b/include/gpu/effects/GrCustomXfermode.h
@@ -22,7 +22,8 @@ class GrTexture;
 namespace GrCustomXfermode {
     bool IsSupportedMode(SkXfermode::Mode mode); 
 
-    GrFragmentProcessor* CreateFP(SkXfermode::Mode mode, GrTexture* background);
+    GrFragmentProcessor* CreateFP(GrShaderDataManager*, SkXfermode::Mode mode,
+                                  GrTexture* background);
 
     GrXPFactory* CreateXPFactory(SkXfermode::Mode mode);
 };