Split cleanup changes out of bigger CL

This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)

TBR=bsalomon@google.com

Change-Id: I1239e806a30a93d3c17ad933f118b98a5077dd3a
Reviewed-on: https://skia-review.googlesource.com/13585
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

6 files changed, 14 insertions, 9 deletions

diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index 15fb645abc..7bf62ece23 100644
--- a/src/gpu/ops/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
@@ -180,6 +180,7 @@ public:
 
     SkString dumpInfo() const override {
         SkString str;
+        str.append(INHERITED::dumpInfo());
         str.appendf("# combined: %d\n", fRectCnt);
         const RectInfo* info = this->first();
         for (int i = 0; i < fRectCnt; ++i) {
@@ -189,7 +190,6 @@ public:
             info = this->next(info);
         }
         str.append(DumpPipelineInfo(*this->pipeline()));
-        str.append(INHERITED::dumpInfo());
         return str;
     }
 
diff --git a/src/gpu/ops/GrClearOp.h b/src/gpu/ops/GrClearOp.h
index 5340af1172..4f51796e6c 100644
--- a/src/gpu/ops/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
@@ -56,6 +56,7 @@ public:
 
     SkString dumpInfo() const override {
         SkString string;
+        string.append(INHERITED::dumpInfo());
         string.appendf("rtID: %d proxyID: %d Scissor [",
                        fRenderTarget.get()->uniqueID().asUInt(),
                        fProxyUniqueID.asUInt());
@@ -65,11 +66,11 @@ public:
         } else {
             string.append("disabled");
         }
-        string.appendf("], Color: 0x%08x ", fColor);
-        string.append(INHERITED::dumpInfo());
+        string.appendf("], Color: 0x%08x\n", fColor);
         return string;
     }
 
+    GrColor color() const { return fColor; }
     void setColor(GrColor color) { fColor = color; }
 
 private:
diff --git a/src/gpu/ops/GrCopySurfaceOp.h b/src/gpu/ops/GrCopySurfaceOp.h
index e455c3e7dc..f479f28d1e 100644
--- a/src/gpu/ops/GrCopySurfaceOp.h
+++ b/src/gpu/ops/GrCopySurfaceOp.h
@@ -25,13 +25,13 @@ public:
 
     SkString dumpInfo() const override {
         SkString string;
-        string.printf("src: (proxyID: %d, rtID: %d), dst: (proxyID: %d, rtID: %d), "
-                      "srcRect: [L: %d, T: %d, R: %d, B: %d], dstPt: [X: %d, Y: %d]",
+        string.append(INHERITED::dumpInfo());
+        string.printf("src: (proxyID: %d, rtID: %d), dst: (proxyID: %d, rtID: %d),\n"
+                      "srcRect: [L: %d, T: %d, R: %d, B: %d], dstPt: [X: %d, Y: %d]\n",
                       fSrcProxyID.asUInt(), fSrc.get()->uniqueID().asUInt(),
                       fDstProxyID.asUInt(), fDst.get()->uniqueID().asUInt(),
                       fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom,
                       fDstPoint.fX, fDstPoint.fY);
-        string.append(INHERITED::dumpInfo());
         return string;
     }
 
diff --git a/src/gpu/ops/GrDiscardOp.h b/src/gpu/ops/GrDiscardOp.h
index ca7f0007de..5640f308ac 100644
--- a/src/gpu/ops/GrDiscardOp.h
+++ b/src/gpu/ops/GrDiscardOp.h
@@ -35,9 +35,9 @@ public:
 
     SkString dumpInfo() const override {
         SkString string;
-        string.printf("rtID: %d proxyID: %d ", fRenderTarget.get()->uniqueID().asUInt(),
-                                               fProxyUniqueID.asUInt());
         string.append(INHERITED::dumpInfo());
+        string.printf("rtID: %d proxyID: %d\n", fRenderTarget.get()->uniqueID().asUInt(),
+                                                fProxyUniqueID.asUInt());
         return string;
     }
 
diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index 8fbd30d280..a4b172d357 100644
--- a/src/gpu/ops/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
@@ -119,6 +119,10 @@ public:
         this->applyPipelineOptimizations(PipelineOptimizations(analysis, overrideColor));
     }
 
+    void addDependenciesTo(GrRenderTargetProxy* rtp) {
+        fPipeline.addDependenciesTo(rtp);
+    }
+
     /**
      * Mesh draw ops use a legacy system in GrRenderTargetContext where the pipeline is created when
      * the op is recorded. These methods are unnecessary as this information is in the pipeline.
diff --git a/src/gpu/ops/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp
index 99cb2bd9df..69bfe291e2 100644
--- a/src/gpu/ops/GrNonAAFillRectOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectOp.cpp
@@ -95,6 +95,7 @@ public:
 
     SkString dumpInfo() const override {
         SkString str;
+        str.append(INHERITED::dumpInfo());
         str.appendf("# combined: %d\n", fRects.count());
         for (int i = 0; i < fRects.count(); ++i) {
             const RectInfo& info = fRects[i];
@@ -103,7 +104,6 @@ public:
                         info.fRect.fBottom);
         }
         str.append(DumpPipelineInfo(*this->pipeline()));
-        str.append(INHERITED::dumpInfo());
         return str;
     }