Partially defer SkImage_Gpu

One of SkImageCacherator, GrBitmapTextureMaker, GrImageTextureMaker, GrTextureAdjuster, GrTextureProducer or SkImage has to take the first step. This is probably the least odd of the options.

Change-Id: Ie167034553451f4b3633a5a1548dbd4d75839b3d
Reviewed-on: https://skia-review.googlesource.com/9488
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/include/gpu/GrSurfaceContext.h b/include/gpu/GrSurfaceContext.h
index ed049be506..109c4a0ffa 100644
--- a/include/gpu/GrSurfaceContext.h
+++ b/include/gpu/GrSurfaceContext.h
@@ -74,12 +74,12 @@ public:
      *              unsupported pixel config.
      */
     bool readPixels(const SkImageInfo& dstInfo, void* dstBuffer, size_t dstRowBytes,
-                    int x, int y) {
-        return this->onReadPixels(dstInfo, dstBuffer, dstRowBytes, x, y);
+                    int x, int y, uint32_t flags = 0) {
+        return this->onReadPixels(dstInfo, dstBuffer, dstRowBytes, x, y, flags);
     }
 
     /**
-     * Writes a rectangle of pixels [srcInfo, srcBuffer, srcRowbytes] into the 
+     * Writes a rectangle of pixels [srcInfo, srcBuffer, srcRowbytes] into the
      * renderTargetContext at the specified position.
      * @param srcInfo       image info for the source pixels
      * @param srcBuffer     source for the write
@@ -137,7 +137,7 @@ private:
                         const SkIRect& srcRect,
                         const SkIPoint& dstPoint) = 0;
     virtual bool onReadPixels(const SkImageInfo& dstInfo, void* dstBuffer,
-                              size_t dstRowBytes, int x, int y) = 0;
+                              size_t dstRowBytes, int x, int y, uint32_t flags) = 0;
     virtual bool onWritePixels(const SkImageInfo& srcInfo, const void* srcBuffer,
                                size_t srcRowBytes, int x, int y, uint32_t flags) = 0;
 
diff --git a/include/gpu/GrTextureContext.h b/include/gpu/GrTextureContext.h
index 6b2f0e379f..d5e1eb9b7c 100644
--- a/include/gpu/GrTextureContext.h
+++ b/include/gpu/GrTextureContext.h
@@ -48,7 +48,7 @@ private:
 
     bool onCopy(GrSurfaceProxy* src, const SkIRect& srcRect, const SkIPoint& dstPoint) override;
     bool onReadPixels(const SkImageInfo& dstInfo, void* dstBuffer,
-                      size_t dstRowBytes, int x, int y) override;
+                      size_t dstRowBytes, int x, int y, uint32_t flags) override;
     bool onWritePixels(const SkImageInfo& srcInfo, const void* srcBuffer,
                        size_t srcRowBytes, int x, int y, uint32_t flags) override;