Revert of Begin weaning GrClipMaskManager off of GrDrawTarget (take 2)

include/gpu/GrDrawContext.h

Index: include/gpu/GrDrawContext.h
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
index 1643cc9678156ad3f0ce1674b6847a5231c08efa..bde2f4a9d4b11cd23bb0abf13e02017e0ad1e039 100644
--- a/include/gpu/GrDrawContext.h
+++ b/include/gpu/GrDrawContext.h
@@ -11,7 +11,6 @@
 #include "GrColor.h"
 #include "GrRenderTarget.h"
 #include "SkRefCnt.h"
-#include "SkRegion.h"
 #include "SkSurfaceProps.h"
 #include "../private/GrSingleOwner.h"
 
@@ -20,7 +19,6 @@
 class GrClip;
 class GrContext;
 class GrDrawBatch;
-class GrDrawContextPriv;
 class GrDrawPathBatchBase;
 class GrDrawingManager;
 class GrDrawTarget;
@@ -279,9 +277,9 @@
 
     GrRenderTarget* accessRenderTarget() { return fRenderTarget; }
 
-    // Provides access to functions that aren't part of the public API.
-    GrDrawContextPriv drawContextPriv();
-    const GrDrawContextPriv drawContextPriv() const;
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    // Functions intended for internal use only.
+    void internal_drawBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawBatch* batch);
 
 protected:
     GrDrawContext(GrContext*, GrDrawingManager*, GrRenderTarget*,
@@ -297,7 +295,6 @@
 private:
     friend class GrAtlasTextBlob; // for access to drawBatch
     friend class GrDrawingManager; // for ctor
-    friend class GrDrawContextPriv;
 
     bool drawFilledDRRect(const GrClip& clip,
                           const GrPaint& paint,
@@ -305,10 +302,6 @@
                           const SkRRect& origOuter,
                           const SkRRect& origInner);
 
-    GrDrawBatch* getFillRectBatch(const GrPaint& paint,
-                                  const SkMatrix& viewMatrix,
-                                  const SkRect& rect);
-
     void internalDrawPath(const GrClip& clip,
                           const GrPaint& paint,
                           const SkMatrix& viewMatrix,