switch GatherPixelRefs to use SkBaseDevice instead of SkBitmapDevice
BUG=
R=robertphillips@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/70473003
git-svn-id: http://skia.googlecode.com/svn/trunk/src@12259 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkBitmapDevice.cpp b/core/SkBitmapDevice.cpp
index 6370487..030331a 100644
--- a/core/SkBitmapDevice.cpp
+++ b/core/SkBitmapDevice.cpp
@@ -77,14 +77,6 @@
}
}
-void SkBitmapDevice::getGlobalBounds(SkIRect* bounds) const {
- if (NULL != bounds) {
- const SkIPoint& origin = this->getOrigin();
- bounds->setXYWH(origin.x(), origin.y(),
- fBitmap.width(), fBitmap.height());
- }
-}
-
void SkBitmapDevice::clear(SkColor color) {
fBitmap.eraseColor(color);
}
diff --git a/gpu/SkGpuDevice.cpp b/gpu/SkGpuDevice.cpp
index 429ee9f..747688e 100644
--- a/gpu/SkGpuDevice.cpp
+++ b/gpu/SkGpuDevice.cpp
@@ -513,13 +513,6 @@
}
///////////////////////////////////////////////////////////////////////////////
-void SkGpuDevice::getGlobalBounds(SkIRect* bounds) const {
- if (NULL != bounds) {
- const SkIPoint& origin = this->getOrigin();
- bounds->setXYWH(origin.x(), origin.y(),
- this->width(), this->height());
- }
-}
SkBitmap::Config SkGpuDevice::config() const {
if (NULL == fRenderTarget) {
diff --git a/utils/SkPictureUtils.cpp b/utils/SkPictureUtils.cpp
index ffd9aa4..fa16af0 100644
--- a/utils/SkPictureUtils.cpp
+++ b/utils/SkPictureUtils.cpp
@@ -45,36 +45,40 @@
/**
* 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.
- * FIXME: Derive from SkBaseDevice.
+ * behind its device.
*/
-class GatherPixelRefDevice : public SkBitmapDevice {
-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());
- }
- }
- }
-
+class GatherPixelRefDevice : public SkBaseDevice {
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.
+ 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();
}
@@ -156,8 +160,43 @@
return false;
}
+ virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {
+ not_supported();
+ }
+ virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config config,
+ int width, int height,
+ bool isOpaque,
+ Usage usage) SK_OVERRIDE {
+ // we expect to only get called via savelayer, in which case it is fine.
+ SkASSERT(kSaveLayer_Usage == usage);
+ return SkNEW_ARGS(GatherPixelRefDevice, (width, height, fPRSet));
+ }
+ virtual void flush() SK_OVERRIDE {}
+
private:
- typedef SkBitmapDevice INHERITED;
+ PixelRefSet* fPRSet;
+ SkBitmap fEmptyBitmap; // legacy -- need to remove the need for this guy
+ SkISize fSize;
+
+ 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());
+ }
+ }
+ }
+
+ typedef SkBaseDevice INHERITED;
};
class NoSaveLayerCanvas : public SkCanvas {
@@ -214,11 +253,7 @@
SkTDArray<SkPixelRef*> array;
PixelRefSet prset(&array);
- SkBitmap emptyBitmap;
- 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);
