summaryrefslogtreecommitdiffstats
path: root/skia/ext
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-22 00:46:07 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-22 00:46:07 +0000
commit03cc8854790c813eeffe9bce4882b50720f2cdb6 (patch)
tree2b562cae77e27f467c2795d91dec073578db01ab /skia/ext
parent6ff960b60f5b9e7f10657afd01fcb2c412bf161b (diff)
downloadchromium_src-03cc8854790c813eeffe9bce4882b50720f2cdb6.zip
chromium_src-03cc8854790c813eeffe9bce4882b50720f2cdb6.tar.gz
chromium_src-03cc8854790c813eeffe9bce4882b50720f2cdb6.tar.bz2
guard older onReadPixels override in preparation for deprecating it
TBR=fmalita@chromium.org Review URL: https://codereview.chromium.org/208663002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
-rw-r--r--skia/ext/pixel_ref_utils.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/skia/ext/pixel_ref_utils.cc b/skia/ext/pixel_ref_utils.cc
index 26aef37..431240c 100644
--- a/skia/ext/pixel_ref_utils.cc
+++ b/skia/ext/pixel_ref_utils.cc
@@ -313,12 +313,23 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const SkPaint&) SK_OVERRIDE {}
protected:
+#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG
virtual bool onReadPixels(const SkBitmap& bitmap,
int x,
int y,
SkCanvas::Config8888 config8888) SK_OVERRIDE {
return false;
}
+#endif
+
+ virtual bool onReadPixels(const SkImageInfo& info,
+ void* pixels,
+ size_t rowBytes,
+ int x,
+ int y) SK_OVERRIDE {
+ return false;
+ }
+
virtual bool onWritePixels(const SkImageInfo& info,
const void* pixels,
size_t rowBytes,