Revert of Use transfer buffer for BatchAtlas texture copies

src/gpu/GrBatchAtlas.h

Index: src/gpu/GrBatchAtlas.h
diff --git a/src/gpu/GrBatchAtlas.h b/src/gpu/GrBatchAtlas.h
index 418739fee68f65bd55ebfe5308e06bec3e2d4999..707f463d970684228eb5d768fb30db76edeaa9e5 100644
--- a/src/gpu/GrBatchAtlas.h
+++ b/src/gpu/GrBatchAtlas.h
@@ -16,8 +16,6 @@
 #include "batches/GrDrawBatch.h"
 
 class GrRectanizer;
-class GrResourceProvider;
-class GrBuffer;
 
 struct GrBatchAtlasConfig {
     int numPlotsX() const { return fWidth / fPlotWidth; }
@@ -43,7 +41,7 @@
     // the eviction
     typedef void (*EvictionFunc)(GrBatchAtlas::AtlasID, void*);
 
-    GrBatchAtlas(GrResourceProvider*, GrTexture*, int numPlotsX, int numPlotsY);
+    GrBatchAtlas(GrTexture*, int numPlotsX, int numPlotsY);
     ~GrBatchAtlas();
 
     // Adds a width x height subimage to the atlas. Upon success it returns
@@ -174,21 +172,19 @@
         void setLastUploadToken(GrBatchDrawToken batchToken) { fLastUpload = batchToken; }
         void setLastUseToken(GrBatchDrawToken batchToken) { fLastUse = batchToken; }
 
-        void uploadToTexture(GrDrawBatch::WritePixelsFn&, GrDrawBatch::TransferPixelsFn&, 
-                             GrTexture* texture);
+        void uploadToTexture(GrDrawBatch::WritePixelsFn&, GrTexture* texture);
         void resetRects();
 
     private:
         BatchPlot(int index, uint64_t genID, int offX, int offY, int width, int height,
-                  GrPixelConfig config, GrResourceProvider* rp);
+                  GrPixelConfig config);
 
         ~BatchPlot() override;
 
         // Create a clone of this plot. The cloned plot will take the place of the
         // current plot in the atlas.
         BatchPlot* clone() const {
-            return new BatchPlot(fIndex, fGenID+1, fX, fY, fWidth, fHeight, fConfig,
-                                 fResourceProvider);
+            return new BatchPlot(fIndex, fGenID+1, fX, fY, fWidth, fHeight, fConfig);
         }
 
         static GrBatchAtlas::AtlasID CreateId(uint32_t index, uint64_t generation) {
@@ -197,16 +193,13 @@
             return generation << 16 | index;
         }
 
-        // used to create transfer buffers
-        GrResourceProvider*   fResourceProvider;
         GrBatchDrawToken      fLastUpload;
         GrBatchDrawToken      fLastUse;
 
         const uint32_t        fIndex;
         uint64_t              fGenID;
         GrBatchAtlas::AtlasID fID;
-        unsigned char*        fDataPtr;
-        GrBuffer*             fTransferBuffer;
+        unsigned char*        fData;
         const int             fWidth;
         const int             fHeight;
         const int             fX;