Make GrClipMaskManager stateless and push GrPipelineBuilder construction downstack

tools/gpu/GrTest.cpp

Index: tools/gpu/GrTest.cpp
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index be539cabbd469306d241c28f02616c996884317f..8fdab2e71613c899a38066119e7a8d8b932b099d 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -242,9 +242,9 @@ void GrDrawContextPriv::testingOnly_drawBatch(const GrPipelineBuilder& pipelineB
     GR_AUDIT_TRAIL_AUTO_FRAME(fDrawContext->fAuditTrail, "GrDrawContext::testingOnly_drawBatch");
 
     if (clip) {
-        fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, *clip, batch);
+        fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, fDrawContext, *clip, batch);
     } else {
-        fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, GrNoClip(), batch);
+        fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, fDrawContext, GrNoClip(), batch);
     }
 }