Revert of Use transfer buffer for BatchAtlas texture copies

src/gpu/batches/GrDrawBatch.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 GrDrawBatch_DEFINED
 #define GrDrawBatch_DEFINED
 
@@ skipping 28 matching lines @@
     explicit GrBatchDrawToken(uint64_t sequenceNumber) : fSequenceNumber(sequenceNumber) {}
     friend class GrBatchFlushState;
     uint64_t fSequenceNumber;
 };
 
 /**
  * Base class for GrBatches that draw. These batches have a GrPipeline installed by GrDrawTarget.
  */
 class GrDrawBatch : public GrBatch {
 public:
-    /** Method that performs a texture write on behalf of a DeferredUploadFn. */
+    /** Method that performs an upload on behalf of a DeferredUploadFn. */
     using WritePixelsFn = std::function<bool(GrSurface* texture,
                                              int left, int top, int width, int height,
-                                             GrPixelConfig config, const void* buffer, 
+                                             GrPixelConfig config, const void* buffer,
                                              size_t rowBytes)>;
-    using TransferPixelsFn = std::function<bool(GrTexture* texture,
-                                                int left, int top, int width, int height,
-                                                GrPixelConfig config, GrBuffer* buffer,
-                                                size_t offset, size_t rowBytes)>;
     /** See comments before GrDrawBatch::Target definition on how deferred uploaders work. */
-    using DeferredUploadFn = std::function<void(WritePixelsFn&, TransferPixelsFn&)>;
+    using DeferredUploadFn = std::function<void(WritePixelsFn&)>;
 
     class Target;
 
     GrDrawBatch(uint32_t classID);
     ~GrDrawBatch() override;
 
     /**
      * Fills in a structure informing the XP of overrides to its normal behavior.
      */
     void getPipelineOptimizations(GrPipelineOptimizations* override) const;
@@ skipping 59 matching lines @@
     };
     SkTArray<QueuedUpload>   fInlineUploads;
 
 private:
     SkAlignedSTStorage<1, GrPipeline>               fPipelineStorage;
     bool                                            fPipelineInstalled;
     typedef GrBatch INHERITED;
 };
 
 #endif