Update SkSpecialImage API

src/core/SkSpecialSurface.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #ifndef SkSpecialSurface_DEFINED
 #define SkSpecialSurface_DEFINED
 
@@ skipping 35 matching lines @@
     *  point. The canvas returned by 'getCanvas' becomes invalidated by this
     *  call and no more drawing to this surface is allowed.
     *
     *  Note: the caller inherits a ref from this call that must be balanced
     */
     SkSpecialImage* newImageSnapshot();
 
     /**
      *  Use an existing (renderTarget-capable) GrTexture as the backing store.
      */
-    static SkSpecialSurface* NewFromTexture(const SkIRect& subset, GrTexture*,
+    static SkSpecialSurface* NewFromTexture(SkImageFilter::Proxy* proxy,
+                                            const SkIRect& subset, GrTexture*,
                                             const SkSurfaceProps* = nullptr);
 
     /**
      *  Allocate a new GPU-backed SkSpecialSurface. If the requested surface cannot
      *  be created, nullptr will be returned.
      */
-    static SkSpecialSurface* NewRenderTarget(GrContext*, const GrSurfaceDesc&,
+    static SkSpecialSurface* NewRenderTarget(SkImageFilter::Proxy* proxy,
+                                             GrContext*, const GrSurfaceDesc&,
                                              const SkSurfaceProps* = nullptr);
 
     /**
      * Use and existing SkBitmap as the backing store.
      */
-    static SkSpecialSurface* NewFromBitmap(const SkIRect& subset, SkBitmap& bm,
+    static SkSpecialSurface* NewFromBitmap(SkImageFilter::Proxy* proxy,
+                                           const SkIRect& subset, SkBitmap& bm,
                                            const SkSurfaceProps* = nullptr);
 
     /**
      *  Return a new CPU-backed surface, with the memory for the pixels automatically
      *  allocated.
      *
      *  If the requested surface cannot be created, or the request is not a
      *  supported configuration, nullptr will be returned.
      */
-    static SkSpecialSurface* NewRaster(const SkImageInfo&, const SkSurfaceProps* = nullptr);
+    static SkSpecialSurface* NewRaster(SkImageFilter::Proxy* proxy,
+                                       const SkImageInfo&, const SkSurfaceProps* = nullptr);
 
 protected:
-    SkSpecialSurface(const SkIRect& subset, const SkSurfaceProps*);
+    SkSpecialSurface(SkImageFilter::Proxy*, const SkIRect& subset, const SkSurfaceProps*);
 
     // For testing only
     friend class TestingSpecialSurfaceAccess;
     const SkIRect& subset() const { return fSubset; }
 
+    // TODO: remove this ASAP

[Stephen White, 2016/02/17 21:44:03]

Replace w/bug ID?

[robertphillips, 2016/02/18 13:18:39]

Done.

+    SkImageFilter::Proxy* proxy() const { return fProxy; }
+
 private:
     const SkSurfaceProps fProps;
     const SkIRect        fSubset;
 
+    // TODO: remove ASAP
+    SkImageFilter::Proxy* fProxy;
+
     typedef SkRefCnt INHERITED;
 };
 
 #endif