Begin weaning GrClipMaskManager off of GrDrawTarget (take 2)

src/gpu/GrDrawContextPriv.h

Index: src/gpu/GrDrawContextPriv.h
diff --git a/src/gpu/GrDrawContextPriv.h b/src/gpu/GrDrawContextPriv.h
new file mode 100644
index 0000000000000000000000000000000000000000..d3a1467d3dc890e39898ad261546646968593172
--- /dev/null
+++ b/src/gpu/GrDrawContextPriv.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawContextPriv_DEFINED
+#define GrDrawContextPriv_DEFINED
+
+#include "GrDrawContext.h"
+
+class GrStencilSettings;
+
+/** Class that adds methods to GrDrawContext that are only intended for use internal to Skia.
+    This class is purely a privileged window into GrDrawContext. It should never have additional
+    data members or virtual methods. */
+class GrDrawContextPriv {
+public:
+    bool drawAndStencilRect(const SkIRect* scissorRect,
+                            const GrStencilSettings&,
+                            SkRegion::Op op,
+                            bool invert,
+                            bool doAA,
+                            const SkMatrix& viewMatrix,
+                            const SkRect&);
+
+    bool drawAndStencilPath(const SkIRect* scissorRect,
+                            const GrStencilSettings&,
+                            SkRegion::Op op,
+                            bool invert,
+                            bool doAA,
+                            const SkMatrix& viewMatrix,
+                            const SkPath&);
+
+    void internal_drawBatch(const GrPipelineBuilder& pipelineBuilder,

[bsalomon, 2016/03/02 14:15:34]

Maybe this should drop the internal_ prefix now that it is behind the priv
interface? Otherwise, lgtm.

[robertphillips, 2016/03/02 16:02:55]

Done-ish. I've renamed it to testingOnly_drawBatch. I would like to avoid having
another generically named drawBatch entry point since I feel we already have too
many.

+                            GrDrawBatch* batch);
+
+private:
+    explicit GrDrawContextPriv(GrDrawContext* drawContext) : fDrawContext(drawContext) {}
+    GrDrawContextPriv(const GrRenderTargetPriv&) {} // unimpl
+    GrDrawContextPriv& operator=(const GrRenderTargetPriv&); // unimpl
+
+    // No taking addresses of this type.
+    const GrDrawContextPriv* operator&() const;
+    GrDrawContextPriv* operator&();
+
+    GrDrawContext* fDrawContext;
+        
+    friend class GrDrawContext; // to construct/copy this type.
+};
+
+inline GrDrawContextPriv GrDrawContext::drawContextPriv() { return GrDrawContextPriv(this); }
+
+inline const GrDrawContextPriv GrDrawContext::drawContextPriv () const {
+    return GrDrawContextPriv(const_cast<GrDrawContext*>(this));
+}
+
+#endif
+