Revert of some cleanup around GrGpu/GrDrawTarget copySurface

src/gpu/GrGpu.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpu.h"
@@ skipping 191 matching lines @@
     return this->onWriteTexturePixels(texture, left, top, width, height,
                                       config, buffer, rowBytes);
 }
 
 void GrGpu::resolveRenderTarget(GrRenderTarget* target) {
     SkASSERT(target);
     this->handleDirtyContext();
     this->onResolveRenderTarget(target);
 }
 
+void GrGpu::initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) {
+    // Make the dst of the copy be a render target because the default copySurface draws to the dst.
+    desc->fOrigin = kDefault_GrSurfaceOrigin;
+    desc->fFlags = kRenderTarget_GrSurfaceFlag | kNoStencil_GrSurfaceFlag;
+    desc->fConfig = src->config();
+}
+
 typedef GrTraceMarkerSet::Iter TMIter;
 void GrGpu::saveActiveTraceMarkers() {
     if (this->caps()->gpuTracingSupport()) {
         SkASSERT(0 == fStoredTraceMarkers.count());
         fStoredTraceMarkers.addSet(fActiveTraceMarkers);
         for (TMIter iter = fStoredTraceMarkers.begin(); iter != fStoredTraceMarkers.end(); ++iter) {
             this->removeGpuTraceMarker(&(*iter));
         }
     }
 }
@@ skipping 97 matching lines @@
     this->handleDirtyContext();
 
     if (!this->flushGraphicsState(ds, kDrawPaths_DrawType)) {
         return;
     }
 
     pathRange->willDrawPaths(indices, indexType, count);
     this->pathRendering()->drawPaths(pathRange, indices, indexType, transformValues,
                                      transformType, count, stencilSettings);
 }