Move DstCoordTexture to GrXP, rename and remove the word "copy" from dstcopytexture names.

src/gpu/GrDrawTarget.cpp

Index: src/gpu/GrDrawTarget.cpp
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 7565cd1df865aaeca1ce55d479de2a3ef8b449e1..c9719e69840e09e70066e8cc9864c34f30094983 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -42,9 +42,9 @@ GrDrawTarget::GrDrawTarget(GrContext* context)
 bool GrDrawTarget::setupDstReadIfNecessary(const GrPipelineBuilder& pipelineBuilder,
                                            const GrProcOptInfo& colorPOI,
                                            const GrProcOptInfo& coveragePOI,
-                                           GrDeviceCoordTexture* dstCopy,
+                                           GrXferProcessor::DstTexture* dstTexture,
                                            const SkRect* drawBounds) {
-    if (!pipelineBuilder.willXPNeedDstCopy(*this->caps(), colorPOI, coveragePOI)) {
+    if (!pipelineBuilder.willXPNeedDstTexture(*this->caps(), colorPOI, coveragePOI)) {
         return true;
     }
 
@@ -54,8 +54,8 @@ bool GrDrawTarget::setupDstReadIfNecessary(const GrPipelineBuilder& pipelineBuil
         if (GrTexture* rtTex = rt->asTexture()) {
             // The render target is a texture, se we can read from it directly in the shader. The XP
             // will be responsible to detect this situation and request a texture barrier.
-            dstCopy->setTexture(rtTex);
-            dstCopy->setOffset(0, 0);
+            dstTexture->setTexture(rtTex);
+            dstTexture->setOffset(0, 0);
             return true;
         }
     }
@@ -101,8 +101,8 @@ bool GrDrawTarget::setupDstReadIfNecessary(const GrPipelineBuilder& pipelineBuil
     }
     SkIPoint dstPoint = {0, 0};
     this->copySurface(copy, rt, copyRect, dstPoint);
-    dstCopy->setTexture(copy);
-    dstCopy->setOffset(copyRect.fLeft, copyRect.fTop);
+    dstTexture->setTexture(copy);
+    dstTexture->setOffset(copyRect.fLeft, copyRect.fTop);
     return true;
 }
 
@@ -447,7 +447,7 @@ void GrDrawTarget::setupPipeline(const PipelineInfo& pipelineInfo,
                                                 pipelineInfo.fCoveragePOI,
                                                 *this->caps(),
                                                 *pipelineInfo.fScissor,
-                                                &pipelineInfo.fDstCopy));
+                                                &pipelineInfo.fDstTexture));
 }
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -461,7 +461,7 @@ GrDrawTarget::PipelineInfo::PipelineInfo(GrPipelineBuilder* pipelineBuilder,
     fColorPOI = fPipelineBuilder->colorProcInfo(primProc);
     fCoveragePOI = fPipelineBuilder->coverageProcInfo(primProc);
     if (!target->setupDstReadIfNecessary(*fPipelineBuilder, fColorPOI, fCoveragePOI,
-                                         &fDstCopy, devBounds)) {
+                                         &fDstTexture, devBounds)) {
         fPipelineBuilder = NULL;
     }
 }
@@ -476,7 +476,7 @@ GrDrawTarget::PipelineInfo::PipelineInfo(GrPipelineBuilder* pipelineBuilder,
     fColorPOI = fPipelineBuilder->colorProcInfo(batch);
     fCoveragePOI = fPipelineBuilder->coverageProcInfo(batch);
     if (!target->setupDstReadIfNecessary(*fPipelineBuilder, fColorPOI, fCoveragePOI,
-                                         &fDstCopy, devBounds)) {
+                                         &fDstTexture, devBounds)) {
         fPipelineBuilder = NULL;
     }
 }