switch GatherPixelRefs to use SkBaseDevice instead of SkBitmapDevice

src/utils/SkPictureUtils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ skipping 29 matching lines @@
     SkDEBUGFAIL("this method should never be called");
 }
 
 static void nothing_to_do() {}
 
 /**
  *  This device will route all bitmaps (primitives and in shaders) to its PRSet.
  *  It should never actually draw anything, so there need not be any pixels
  *  behind its device-bitmap.
  */
-class GatherPixelRefDevice : public SkBitmapDevice {
+class GatherPixelRefDevice : public SkBaseDevice {
 private:
     PixelRefSet*  fPRSet;
 
     void addBitmap(const SkBitmap& bm) {
         fPRSet->add(bm.pixelRef());
     }
 
     void addBitmapFromPaint(const SkPaint& paint) {
         SkShader* shader = paint.getShader();
         if (shader) {
             SkBitmap bm;
             // Check whether the shader is a gradient in order to short-circuit
             // call to asABitmap to prevent generation of bitmaps from
             // gradient shaders, which implement asABitmap.
             if (SkShader::kNone_GradientType == shader->asAGradient(NULL) &&
                 shader->asABitmap(&bm, NULL, NULL)) {
                 fPRSet->add(bm.pixelRef());
             }
         }
     }
 
 public:
-    GatherPixelRefDevice(const SkBitmap& bm, PixelRefSet* prset) : SkBitmapDevice(bm) {
+    GatherPixelRefDevice(int width, int height, PixelRefSet* prset) {
+        fSize.set(width, height);
+        fEmptyBitmap.setConfig(SkBitmap::kNo_Config, width, height);
         fPRSet = prset;
     }
 
+    virtual uint32_t getDeviceCapabilities() SK_OVERRIDE { return 0; }
+    virtual int width() const SK_OVERRIDE { return fSize.width(); }
+    virtual int height() const SK_OVERRIDE { return fSize.height(); }
+    virtual bool isOpaque() const SK_OVERRIDE { return false; }
+    virtual SkBitmap::Config config() const SK_OVERRIDE {
+        return SkBitmap::kNo_Config;
+    }
+    virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; }
+    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE {
+        return true;
+    }
+    // TODO: allow this call to return failure, or move to SkBitmapDevice only.

[robertphillips, 2013/11/12 18:36:24]

I would like it to be on SkBitmapDevice only (although that is going to be
tough).

+    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE {
+        return fEmptyBitmap;
+    }
+    virtual void lockPixels() SK_OVERRIDE { nothing_to_do(); }
+    virtual void unlockPixels() SK_OVERRIDE { nothing_to_do(); }
+    virtual bool allowImageFilter(SkImageFilter*) SK_OVERRIDE { return false; }
+    virtual bool canHandleImageFilter(SkImageFilter*) SK_OVERRIDE { return false; }
+    virtual bool filterImage(SkImageFilter*, const SkBitmap&, const SkMatrix&,
+                             SkBitmap* result, SkIPoint* offset) SK_OVERRIDE {
+        return false;
+    }
+
     virtual void clear(SkColor color) SK_OVERRIDE {
         nothing_to_do();
     }
     virtual void writePixels(const SkBitmap& bitmap, int x, int y,
                              SkCanvas::Config8888 config8888) SK_OVERRIDE {
         not_supported();
     }
 
     virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE {
         this->addBitmapFromPaint(paint);
     }
     virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
                             const SkPoint[], const SkPaint& paint) SK_OVERRIDE {
         this->addBitmapFromPaint(paint);
     }
     virtual void drawRect(const SkDraw&, const SkRect&,
                           const SkPaint& paint) SK_OVERRIDE {
         this->addBitmapFromPaint(paint);
     }
+    virtual void drawRRect(const SkDraw&, const SkRRect&,
+                          const SkPaint& paint) SK_OVERRIDE {
+        this->addBitmapFromPaint(paint);
+    }
     virtual void drawOval(const SkDraw&, const SkRect&,
                           const SkPaint& paint) SK_OVERRIDE {
         this->addBitmapFromPaint(paint);
     }
     virtual void drawPath(const SkDraw&, const SkPath& path,
                           const SkPaint& paint, const SkMatrix* prePathMatrix,
                           bool pathIsMutable) SK_OVERRIDE {
         this->addBitmapFromPaint(paint);
     }
     virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
@@ skipping 37 matching lines @@
         nothing_to_do();
     }
 
 protected:
     virtual bool onReadPixels(const SkBitmap& bitmap,
                               int x, int y,
                               SkCanvas::Config8888 config8888) SK_OVERRIDE {
         not_supported();
         return false;
     }
 

[robertphillips, 2013/11/12 18:36:24]

Can this move to SkBitmapDevice?

+    virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {
+        not_supported();
+    }

[robertphillips, 2013/11/12 18:36:24]

I would think this could work - in theory.

+    virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config config,

[scroggo, 2013/11/12 18:22:00]

nit: newline between functions.

+                                                   int width, int height,
+                                                   bool isOpaque,
+                                                   Usage usage) SK_OVERRIDE {
+        return NULL;
+    }
+    virtual void flush() SK_OVERRIDE {}

[scroggo, 2013/11/12 18:22:00]

nit: newline between functions.

+
 private:
-    typedef SkBitmapDevice INHERITED;
+    SkBitmap fEmptyBitmap;  // legacy -- need to remove the need for this guy
+    SkISize fSize;
+    typedef SkBaseDevice INHERITED;
 };
 
 class NoSaveLayerCanvas : public SkCanvas {
 public:
     NoSaveLayerCanvas(SkBaseDevice* device) : INHERITED(device) {}
 
     // turn saveLayer() into save() for speed, should not affect correctness.
     virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
                           SaveFlags flags) SK_OVERRIDE {
 
@@ skipping 36 matching lines @@
     // this test also handles if either area or pict's width/height are empty
     if (!SkRect::Intersects(area,
                             SkRect::MakeWH(SkIntToScalar(pict->width()),
                                            SkIntToScalar(pict->height())))) {
         return NULL;
     }
 
     SkTDArray<SkPixelRef*> array;
     PixelRefSet prset(&array);
 
     SkBitmap emptyBitmap;

[scroggo, 2013/11/12 18:22:00]

Can this be removed?

     emptyBitmap.setConfig(SkBitmap::kARGB_8888_Config, pict->width(), pict->height());
     // note: we do not set any pixels (shouldn't need to)
 
-    GatherPixelRefDevice device(emptyBitmap, &prset);
+    GatherPixelRefDevice device(pict->width(), pict->height(), &prset);
     NoSaveLayerCanvas canvas(&device);
 
     canvas.clipRect(area, SkRegion::kIntersect_Op, false);
     canvas.drawPicture(*pict);
 
     SkData* data = NULL;
     int count = array.count();
     if (count > 0) {
         data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*));
     }
     return data;
 }