diff options
author | 2014-03-12 03:04:08 +0000 | |
---|---|---|
committer | 2014-03-12 03:04:08 +0000 | |
commit | 2cccf833265a607be62f1d77ee51662b49d9e813 (patch) | |
tree | 85c03c36ec810aaf73d4a2058fd3da3153d21a9f /include/core/SkDevice.h | |
parent | 0b70816eb157ed6492623eea1e55005ef40c908c (diff) |
make onReadPixels protected and have default impl (so we can remove chrome override)
R=reed@google.com
TBR=bsalomon@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/196543004
git-svn-id: http://skia.googlecode.com/svn/trunk@13756 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkDevice.h')
-rw-r--r-- | include/core/SkDevice.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index b78dfbff90..90bdfa335d 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -336,17 +336,6 @@ protected: */ virtual const SkBitmap& onAccessBitmap() = 0; - /** - * Implements readPixels API. The caller will ensure that: - * 1. bitmap has pixel config kARGB_8888_Config. - * 2. bitmap has pixels. - * 3. The rectangle (x, y, x + bitmap->width(), y + bitmap->height()) is - * contained in the device bounds. - */ - virtual bool onReadPixels(const SkBitmap& bitmap, - int x, int y, - SkCanvas::Config8888 config8888) = 0; - /** Called when this device is installed into a Canvas. Balanced by a call to unlockPixels() when the device is removed from a Canvas. */ @@ -392,6 +381,17 @@ protected: virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes); /** + * Implements readPixels API. The caller will ensure that: + * 1. bitmap has pixel config kARGB_8888_Config. + * 2. bitmap has pixels. + * 3. The rectangle (x, y, x + bitmap->width(), y + bitmap->height()) is + * contained in the device bounds. + */ + virtual bool onReadPixels(const SkBitmap& bitmap, + int x, int y, + SkCanvas::Config8888 config8888); + + /** * The caller is responsible for "pre-clipping" the src. The impl can assume that the src * image at the specified x,y offset will fit within the device's bounds. * |