aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-11-02 20:06:25 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-11-02 20:06:25 +0000
commit910267dde2d036b6298f62943f019bda3d662eb2 (patch)
tree21ed302747dfc92c792493002653ba19a9f61493 /include
parentc69809745e6496564639e42ef998ad39adf7dfb8 (diff)
Make SkDevice::onReadPixels take a const& rather than const*
git-svn-id: http://skia.googlecode.com/svn/trunk@2587 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkDevice.h3
-rw-r--r--include/device/xps/SkXPSDevice.h2
-rw-r--r--include/gpu/SkGpuDevice.h2
-rw-r--r--include/pdf/SkPDFDevice.h2
4 files changed, 4 insertions, 5 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index 5d184e478f..4dadfc43cb 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -275,9 +275,8 @@ protected:
* 2. bitmap has pixels.
* 3. The rectangle (x, y, x + bitmap->width(), y + bitmap->height()) is
* contained in the device bounds.
- * 4. the bitmap struct is safe to partially overwrite in case of failure
*/
- virtual bool onReadPixels(const SkBitmap* bitmap, int x, int y);
+ virtual bool onReadPixels(const SkBitmap& bitmap, int x, int y);
/** Called when this device is installed into a Canvas. Balanaced by a call
diff --git a/include/device/xps/SkXPSDevice.h b/include/device/xps/SkXPSDevice.h
index ed61ced8d0..bac7f38a4a 100644
--- a/include/device/xps/SkXPSDevice.h
+++ b/include/device/xps/SkXPSDevice.h
@@ -141,7 +141,7 @@ protected:
int x, int y,
const SkPaint& paint) SK_OVERRIDE;
- virtual bool onReadPixels(const SkBitmap* bitmap,
+ virtual bool onReadPixels(const SkBitmap& bitmap,
int x,
int y) SK_OVERRIDE {
return false;
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index 047fd0740c..d394d1202d 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -141,7 +141,7 @@ protected:
friend class SkAutoTexCache;
// overrides from SkDevice
- virtual bool onReadPixels(const SkBitmap* bitmap,
+ virtual bool onReadPixels(const SkBitmap& bitmap,
int x, int y) SK_OVERRIDE;
diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h
index b25e39a7d0..1e4db86d2d 100644
--- a/include/pdf/SkPDFDevice.h
+++ b/include/pdf/SkPDFDevice.h
@@ -158,7 +158,7 @@ public:
}
protected:
- virtual bool onReadPixels(const SkBitmap* bitmap,
+ virtual bool onReadPixels(const SkBitmap& bitmap,
int x, int y) SK_OVERRIDE {
return false;
}