Pass GrSurfaceContext into read/writeSurfacePixels

This is mainly so writeSurfacePixels can have continuity of surfaceContext when it draws.

Change-Id: I34f1dc5c4c3dcfa7bf91aa3ad72b7a48ed9de1a9
Reviewed-on: https://skia-review.googlesource.com/13595
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index 6b6a942720..2bde24baf5 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -46,8 +46,7 @@ bool GrSurfaceContext::readPixels(const SkImageInfo& dstInfo, void* dstBuffer,
         flags |= GrContextPriv::kUnpremul_PixelOpsFlag;
     }
 
-    return fContext->contextPriv().readSurfacePixels(this->asSurfaceProxy(),
-                                                     this->getColorSpace(), x, y,
+    return fContext->contextPriv().readSurfacePixels(this, x, y,
                                                      dstInfo.width(), dstInfo.height(), config,
                                                      dstInfo.colorSpace(),
                                                      dstBuffer, dstRowBytes, flags);
@@ -64,8 +63,7 @@ bool GrSurfaceContext::writePixels(const SkImageInfo& srcInfo, const void* srcBu
         flags |= GrContextPriv::kUnpremul_PixelOpsFlag;
     }
 
-    return fContext->contextPriv().writeSurfacePixels(this->asSurfaceProxy(),
-                                                      this->getColorSpace(), x, y,
+    return fContext->contextPriv().writeSurfacePixels(this, x, y,
                                                       srcInfo.width(), srcInfo.height(),
                                                       config, srcInfo.colorSpace(),
                                                       srcBuffer, srcRowBytes, flags);