Make filters use SkImage instead of SkBitmap

src/gpu/SkGpuDevice.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
@@ skipping 85 matching lines @@
                           const SkPaint& paint, const SkMatrix* prePathMatrix,
                           bool pathIsMutable) SK_OVERRIDE;
     virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
                             const SkMatrix&, const SkPaint&) SK_OVERRIDE;
     virtual void drawBitmapRect(const SkDraw&, const SkBitmap&,
                                 const SkRect* srcOrNull, const SkRect& dst,
                                 const SkPaint& paint,
                                 SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE;
     virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
                             int x, int y, const SkPaint& paint) SK_OVERRIDE;
+    virtual void drawSprite(const SkDraw&, const SkImage& image,
+                            int x, int y, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawText(const SkDraw&, const void* text, size_t len,
                           SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE;
     virtual void drawPosText(const SkDraw&, const void* text, size_t len,
                              const SkScalar pos[], int scalarsPerPos,
                              const SkPoint& offset, const SkPaint&) SK_OVERRIDE;
     virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
                               const SkPoint verts[], const SkPoint texs[],
                               const SkColor colors[], SkXfermode* xmode,
                               const uint16_t indices[], int indexCount,
                               const SkPaint&) SK_OVERRIDE;
     virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
                             const SkPaint&) SK_OVERRIDE;
 
     void flush() SK_OVERRIDE;
 
     void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE;
     void onDetachFromCanvas() SK_OVERRIDE;
 
     const SkBitmap& onAccessBitmap() SK_OVERRIDE;
 
     bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE;
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
+    virtual bool filterImage(const SkImageFilter*, const SkImage*,
                              const SkImageFilter::Context&,
-                             SkBitmap*, SkIPoint*) SK_OVERRIDE;
+                             SkAutoTUnref<const SkImage>&, SkIPoint*) SK_OVERRIDE;
 
     bool filterTexture(GrContext*, GrTexture*, const SkImageFilter*,
                        const SkImageFilter::Context&,
-                       SkBitmap* result, SkIPoint* offset);
+                       SkAutoTUnref<const SkImage>& result, SkIPoint* offset);
 
 protected:
     bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE;
     bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE;
     bool onShouldDisableLCD(const SkPaint&) const SK_OVERRIDE;
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture,
                                           const SkMatrix*, const SkPaint*) SK_OVERRIDE;
 
@@ skipping 32 matching lines @@
 
     enum ModifyMode { kDrawContent_ModifyMode, kDiscard_ModifyMode };
     /** Prepares the render target for modification.
      * 1. Detaches the snapshot, if needed.
      * 2. Creates new render target if snapshot refers to the current render target.
      * 3. Does the deferred clear, if needed.
      * returns true if the render target is functional and can be rendered to.
      */
     bool prepareBackendRenderTarget(ModifyMode);
 
+    void internalDrawSprite(const SkDraw& draw, GrTexture* texture,
+                            int left, int top, int width, int height, const SkPaint& paint);
+
     /**
      * Implementation for both drawBitmap and drawBitmapRect.
      */
     void drawBitmapCommon(const SkDraw&,
                           const SkBitmap& bitmap,
                           const SkRect* srcRectPtr,
                           const SkSize* dstSizePtr,      // ignored iff srcRectPtr == NULL
                           const SkPaint&,
                           SkCanvas::DrawBitmapRectFlags flags);
 
@@ skipping 32 matching lines @@
 
     static SkPicture::AccelData::Key ComputeAccelDataKey();
 
     static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
                                               int sampleCount);
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif