commit 095530389d8211895309107a4f74beefacce638c
author reed <reed@google.com> Mon Nov 23 12:32:16 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Nov 23 12:32:16 2015 -0800
tree 6fc046d9f3bf570fb21a3ed1b1283890615a2944
parent 512e437e1e07159a258dd3c5b907576bd1aefc1e

scaling API on SkPixmap

BUG=skia:4481

Review URL: https://codereview.chromium.org/1463373002

src/image/SkImage_Raster.cpp

diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 9c90ba9..977dc01 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -66,10 +66,10 @@
     SkImage_Raster(const SkImageInfo&, SkData*, size_t rb, SkColorTable*);
     virtual ~SkImage_Raster();
 
-    bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY) const override;
+    bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY, CachingHint) const override;
     const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const override;
     SkData* onRefEncoded() const override;
-    bool getROPixels(SkBitmap*) const override;
+    bool getROPixels(SkBitmap*, CachingHint) const override;
     GrTexture* asTextureRef(GrContext*, const GrTextureParams&) const override;
     SkImage* onNewSubset(const SkIRect&) const override;
 
@@ -135,7 +135,7 @@
 SkImage_Raster::~SkImage_Raster() {}
 
 bool SkImage_Raster::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
-                                  int srcX, int srcY) const {
+                                  int srcX, int srcY, CachingHint) const {
     SkBitmap shallowCopy(fBitmap);
     return shallowCopy.readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY);
 }
@@ -162,7 +162,7 @@
     return nullptr;
 }
 
-bool SkImage_Raster::getROPixels(SkBitmap* dst) const {
+bool SkImage_Raster::getROPixels(SkBitmap* dst, CachingHint) const {
     *dst = fBitmap;
     return true;
 }