Make filters use SkImage instead of SkBitmap

include/core/SkDevice.h

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDevice_DEFINED
 #define SkDevice_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkImageFilter.h"
 
 class SkClipStack;
 class SkDraw;
 struct SkIRect;
+class SkImage;
 class SkMatrix;
 class SkMetaData;
 class SkRegion;
 struct SkDeviceProperties;
 class GrRenderTarget;
+class SkSurface_Base;
+
 
 class SK_API SkBaseDevice : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkBaseDevice)
 
     /**
      *  Construct a new device.
     */
     SkBaseDevice();
     explicit SkBaseDevice(const SkDeviceProperties&);
@@ skipping 157 matching lines @@
      *  pre-concated with the current matrix.
      */
     virtual void drawPath(const SkDraw&, const SkPath& path,
                           const SkPaint& paint,
                           const SkMatrix* prePathMatrix = NULL,
                           bool pathIsMutable = false) = 0;
     virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
                             const SkMatrix& matrix, const SkPaint& paint) = 0;
     virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
                             int x, int y, const SkPaint& paint) = 0;
+    virtual void drawImage(const SkDraw&, const SkImage& image,
+                            int x, int y, const SkPaint& paint);
 
     /**
      *  The default impl. will create a bitmap-shader from the bitmap,
      *  and call drawRect with it.
      */
     virtual void drawBitmapRect(const SkDraw&, const SkBitmap&,
                                 const SkRect* srcOrNull, const SkRect& dst,
                                 const SkPaint& paint,
                                 SkCanvas::DrawBitmapRectFlags flags) = 0;
 
@@ skipping 54 matching lines @@
      *  Override and return true for filters that the device can handle
      *  intrinsically. Doing so means that SkCanvas will pass-through this
      *  filter to drawSprite and drawDevice (and potentially filterImage).
      *  Returning false means the SkCanvas will have apply the filter itself,
      *  and just pass the resulting image to the device.
      */
     virtual bool canHandleImageFilter(const SkImageFilter*) { return false; }
 
     /**
      *  Related (but not required) to canHandleImageFilter, this method returns
-     *  true if the device could apply the filter to the src bitmap and return
+     *  true if the device could apply the filter to the src image and return
      *  the result (and updates offset as needed).
      *  If the device does not recognize or support this filter,
      *  it just returns false and leaves result and offset unchanged.
      */
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
+    virtual bool filterImage(const SkImageFilter*, SkImage&,
                              const SkImageFilter::Context&,
-                             SkBitmap* /*result*/, SkIPoint* /*offset*/) {
+                             SkAutoTUnref<SkImage>& /*result*/, SkIPoint* /*offset*/) {
         return false;
     }
 
 protected:
     // default impl returns NULL
     virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&);
 
     // default impl returns NULL
     virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes);
 
@@ skipping 49 matching lines @@
             : fInfo(info)
             , fUsage(usage)
             , fPixelGeometry(AdjustGeometry(info, usage, geo))
         {}
 
         const SkImageInfo     fInfo;
         const Usage           fUsage;
         const SkPixelGeometry fPixelGeometry;
     };
 
+    virtual SkSurface* onCreateCompatibleSurface(const CreateInfo&) {
+        return NULL;
+    }
+    // TODO: left to compile pdf et al.
     virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) {
         return NULL;
     }
 
     virtual void initForRootLayer(SkPixelGeometry geo);
 
 private:
     friend class SkCanvas;
     friend struct DeviceCM; //for setMatrixClip
     friend class SkDraw;
     friend class SkDrawIter;
     friend class SkDeviceFilteredPaint;
     friend class SkDeviceImageFilterProxy;
     friend class SkDeferredDevice;    // for newSurface
     friend class SkNoPixelsBitmapDevice;
 
+    friend class SkSurface;
+    friend class SkSurface_Gpu;
     friend class SkSurface_Raster;
 
+    // TODO: remove when GrRenderTarget is-a SkSurface.

[bsalomon, 2015/02/13 14:24:35]

Do you mean to make GrRenderTarget be a subclass of SkSurface?

+    SkSurface_Base* getSurfaceBase() const { return fSurfaceBase; }
+    void setSurfaceBase(SkSurface_Base* sb) {
+        SkASSERT(fSurfaceBase == NULL || sb == NULL);
+        fSurfaceBase = sb;
+    }
+
     // used to change the backend's pixels (and possibly config/rowbytes)
     // but cannot change the width/height, so there should be no change to
     // any clip information.
     // TODO: move to SkBitmapDevice
     virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) {}
 
     virtual bool forceConservativeRasterClip() const { return false; }
 
     // just called by SkCanvas when built as a layer
     void setOrigin(int x, int y) { fOrigin.set(x, y); }
 
     /** Causes any deferred drawing to the device to be completed.
      */
     virtual void flush() {}
 
     virtual SkImageFilter::Cache* getImageFilterCache() { return NULL; }
 
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
     SkDeviceProperties* fLeakyProperties;   // will always exist.
 
+    SkSurface_Base*  fSurfaceBase;
+
 #ifdef SK_DEBUG
     bool        fAttachedToCanvas;
 #endif
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif