Swap over to using SkImageFilter::filterImage instead of filterImageDeprecated

src/core/SkSpecialImage.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 SkSpecialImage_DEFINED
 #define SkSpecialImage_DEFINED
 
@@ skipping 54 matching lines @@
     /**
      *  Create a new surface with a backend that is compatible with this image.
      */
     SkSpecialSurface* newSurface(const SkImageInfo&) const;
 
     // These three internal methods will go away (see skbug.com/4965)
     bool internal_getBM(SkBitmap* result);
     static SkSpecialImage* internal_fromBM(SkImageFilter::Proxy*, const SkBitmap&);
     SkImageFilter::Proxy* internal_getProxy();
 
+    // TODO: hide this when GrLayerHoister uses SkSpecialImages more fully

[Stephen White, 2016/03/04 15:55:05]

Log a bug and reference it here?

[robertphillips, 2016/03/04 18:08:36]

Done.

+    /**
+     *  If the SpecialImage is backed by a gpu texture, return that texture.
+     *  The active portion of the texture can be retrieved via 'subset'.
+     */
+    GrTexture* peekTexture() const;
+
 protected:
     SkSpecialImage(SkImageFilter::Proxy* proxy, const SkIRect& subset, uint32_t uniqueID)
         : fSubset(subset)
         , fUniqueID(kNeedNewImageUniqueID_SpecialImage == uniqueID ? SkNextID::ImageID()
                                                                    : uniqueID)
         , fProxy(proxy) {
     }
 
     // The following 2 are for testing and shouldn't be used.
     friend class TestingSpecialImageAccess;
     friend class TestingSpecialSurfaceAccess;
 
     /**
      *  If the SpecialImage is backed by cpu pixels, return the const address
      *  of those pixels and, if not null, return the ImageInfo and rowBytes.
      *  The returned address is only valid while the image object is in scope.
      *
      *  The returned ImageInfo represents the backing memory. Use 'subset'
      *  to get the active portion's dimensions.
      *
      *  On failure, return false and ignore the pixmap parameter.
      */
     bool peekPixels(SkPixmap*) const;
 
-    /**
-     *  If the SpecialImage is backed by a gpu texture, return that texture.
-     *  The active portion of the texture can be retrieved via 'subset'.
-     */
-    GrTexture* peekTexture() const;
+    // This entry point is for testing only. It does a readback from VRAM for
+    // GPU-backed special images.
+    bool getROPixels(SkBitmap*) const;

[Stephen White, 2016/03/04 15:55:05]

getROPixelsForTesting(), then?

[robertphillips, 2016/03/04 18:08:36]

Done - went with a prefix.

 
     // TODO: remove this ASAP (see skbug.com/4965)
     SkImageFilter::Proxy* proxy() const { return fProxy; }
 
 private:
     const SkIRect   fSubset;
     const uint32_t  fUniqueID;
 
     // TODO: remove this ASAP (see skbug.com/4965)
     SkImageFilter::Proxy* fProxy;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif