Make GrGpu read/write pixels take GrSurface

src/gpu/GrBatchTarget.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBatchBuffer_DEFINED
 #define GrBatchBuffer_DEFINED
 
@@ skipping 33 matching lines @@
          * @param height        height of rectangle to write in pixels.
          * @param config        the pixel config of the source buffer
          * @param buffer        memory to read pixels from
          * @param rowBytes      number of bytes between consecutive rows. Zero
          *                      means rows are tightly packed.
          */
         bool writeTexturePixels(GrTexture* texture,
                                 int left, int top, int width, int height,
                                 GrPixelConfig config, const void* buffer,
                                 size_t rowBytes) {
-            return fGpu->writeTexturePixels(texture, left, top, width, height, config, buffer,
-                                            rowBytes);
+            return fGpu->writePixels(texture, left, top, width, height, config, buffer, rowBytes);
         }
 
     private:
         GrGpu* fGpu;
     };
 
     class Uploader : public SkRefCnt {
     public:
         Uploader(BatchToken lastUploadToken) : fLastUploadToken(lastUploadToken) {}
         BatchToken lastUploadToken() const { return fLastUploadToken; }
@@ skipping 94 matching lines @@
     FlushBuffer::Iter fIter;
     int fNumberOfDraws;
     BatchToken fCurrentToken;
     BatchToken fLastFlushedToken; // The next token to be flushed
     SkTArray<SkAutoTUnref<Uploader>, true> fAsapUploads;
     SkTArray<SkAutoTUnref<Uploader>, true> fInlineUploads;
     int fInlineUpdatesIndex;
 };
 
 #endif