Switch SkComposeImageFilter over to new onFilterImage interface

include/effects/SkComposeImageFilter.h

Index: include/effects/SkComposeImageFilter.h
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index 6ad6525fbd2db29cc104344532266c4b10cbacfb..bdef08b5e6faf2502087ab98dcbae7031634d8dc 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -12,13 +12,11 @@
 
 class SK_API SkComposeImageFilter : public SkImageFilter {
 public:
-    virtual ~SkComposeImageFilter();
-
     static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
-        if (NULL == outer) {
+        if (!outer) {
             return SkSafeRef(inner);
         }
-        if (NULL == inner) {
+        if (!inner) {
             return SkRef(outer);
         }
         SkImageFilter* inputs[2] = { outer, inner };
@@ -34,8 +32,8 @@ protected:
         SkASSERT(inputs[0]);
         SkASSERT(inputs[1]);
     }
-    bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
-                                 SkBitmap* result, SkIPoint* loc) const override;
+    SkSpecialImage* onFilterImage(SkSpecialImage* source, const Context&,
+                                  SkIPoint* offset) const override;
     bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*, MapDirection) const override;
 
 private: