Misc cleanup

include/core/SkMaskFilter.h

Index: include/core/SkMaskFilter.h
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h
index 4490c6f16ab47774772400eb5f4c5eb81af190b9..df9c4ac3fee3822730841e7927654afc2c779101 100644
--- a/include/core/SkMaskFilter.h
+++ b/include/core/SkMaskFilter.h
@@ -16,9 +16,10 @@
 #include "SkPaint.h"
 
 class GrClip;
-class GrContext;
+class GrDrawContext;
 class GrPaint;
 class GrRenderTarget;
+class GrTextureProvider;
 class SkBitmap;
 class SkBlitter;
 class SkCachedData;
@@ -96,7 +97,8 @@ public:
      *  Try to directly render the mask filter into the target.  Returns
      *  true if drawing was successful.
      */
-    virtual bool directFilterMaskGPU(GrContext* context,
+    virtual bool directFilterMaskGPU(GrTextureProvider* texProvider,
+                                     GrDrawContext* drawContext,
                                      GrRenderTarget* rt,
                                      GrPaint* grp,
                                      const GrClip&,
@@ -107,7 +109,8 @@ public:
      *  Try to directly render a rounded rect mask filter into the target.  Returns
      *  true if drawing was successful.
      */
-    virtual bool directFilterRRectMaskGPU(GrContext* context,
+    virtual bool directFilterRRectMaskGPU(GrTextureProvider* texProvider,
+                                          GrDrawContext* drawContext,
                                           GrRenderTarget* rt,
                                           GrPaint* grp,
                                           const GrClip&,