Revert "Make GrDrawTarget.h and GrPathRenderer.h be private headers"

This reverts commit r2125

Looks like GrPathRenderer.h is used from gpu/include/GrTesselatedPathRenderer.h

There also seems to be a dependency tracking problem, because r2125 didn't go red, but the next revision did.

Review URL: http://codereview.appspot.com/4896048

git-svn-id: http://skia.googlecode.com/svn/trunk@2127 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/include/GrContext.h

@@ -12,20 +12,16 @@
 
 #include "GrClip.h"
 #include "GrPaint.h"
+#include "GrPathRenderer.h"
 
-class GrDefaultPathRenderer;
-class GrDrawTarget;
 class GrFontCache;
 class GrGpu;
 struct GrGpuStats;
-class GrIndexBuffer;
 class GrIndexBufferAllocPool;
 class GrInOrderDrawBuffer;
-class GrPathRenderer;
 class GrResourceEntry;
 class GrResourceCache;
 class GrStencilBuffer;
-class GrVertexBuffer;
 class GrVertexBufferAllocPool;
 
 
@@ -555,7 +551,7 @@ private:
     GrFontCache*        fFontCache;
 
     GrPathRenderer*         fCustomPathRenderer;
-    GrDefaultPathRenderer*  fDefaultPathRenderer;
+    GrDefaultPathRenderer   fDefaultPathRenderer;
 
     GrVertexBufferAllocPool*    fDrawBufferVBAllocPool;
     GrIndexBufferAllocPool*     fDrawBufferIBAllocPool;

gpu/src/GrContext.cpp

@@ -61,7 +61,6 @@ GrContext::~GrContext() {
     delete fDrawBuffer;
     delete fDrawBufferVBAllocPool;
     delete fDrawBufferIBAllocPool;
-    GrSafeUnref(fDefaultPathRenderer);
     GrSafeUnref(fCustomPathRenderer);
     GrSafeUnref(fAAFillRectIndexBuffer);
     GrSafeUnref(fAAStrokeRectIndexBuffer);
@@ -1707,14 +1706,14 @@ void GrContext::printStats() const {
     fGpu->printStats();
 }
 
-GrContext::GrContext(GrGpu* gpu) {
+GrContext::GrContext(GrGpu* gpu) :
+    fDefaultPathRenderer(gpu->supportsTwoSidedStencil(),
+                         gpu->supportsStencilWrapOps()) {
+
     fGpu = gpu;
     fGpu->ref();
     fGpu->setContext(this);
 
-    fDefaultPathRenderer = 
-        new GrDefaultPathRenderer(gpu->supportsTwoSidedStencil(),
-                                  gpu->supportsStencilWrapOps());
     fCustomPathRenderer = GrPathRenderer::CreatePathRenderer();
     fGpu->setClipPathRenderer(fCustomPathRenderer);
 
@@ -1786,8 +1785,8 @@ GrPathRenderer* GrContext::getPathRenderer(const GrPath& path,
         fCustomPathRenderer->canDrawPath(path, fill)) {
         return fCustomPathRenderer;
     } else {
-        GrAssert(fDefaultPathRenderer->canDrawPath(path, fill));
-        return fDefaultPathRenderer;
+        GrAssert(fDefaultPathRenderer.canDrawPath(path, fill));
+        return &fDefaultPathRenderer;
     }
 }
 

gpu/src/GrGpu.cpp

@@ -62,8 +62,6 @@ GrGpu::GrGpu()
 
 GrGpu::~GrGpu() {
     this->releaseResources();
-    GrSafeUnref(fDefaultPathRenderer);
-    GrSafeUnref(fClientPathRenderer);
 }
 
 void GrGpu::abandonResources() {

gyp/gpu.gyp

@@ -87,6 +87,7 @@
         '../gpu/include/GrColor.h',
         '../gpu/include/GrConfig.h',
         '../gpu/include/GrContext.h',
+        '../gpu/include/GrDrawTarget.h',
         '../gpu/include/GrFontScaler.h',
         '../gpu/include/GrGLConfig.h',
         '../gpu/include/GrGLConfig_chrome.h',
@@ -101,6 +102,7 @@
         '../gpu/include/GrNoncopyable.h',
         '../gpu/include/GrPaint.h',
         '../gpu/include/GrPath.h',
+        '../gpu/include/GrPathRenderer.h',
         '../gpu/include/GrPathSink.h',
         '../gpu/include/GrPlotMgr.h',
         '../gpu/include/GrPoint.h',
@@ -136,7 +138,6 @@
         '../gpu/src/GrContext.cpp',
         '../gpu/src/GrCreatePathRenderer_none.cpp',
         '../gpu/src/GrDrawTarget.cpp',
-        '../gpu/src/GrDrawTarget.h',
         '../gpu/src/GrGeometryBuffer.h',
         '../gpu/src/GrGLDefaultInterface_none.cpp',
         '../gpu/src/GrGLIndexBuffer.cpp',
@@ -168,7 +169,6 @@
         '../gpu/src/GrMatrix.cpp',
         '../gpu/src/GrMemory.cpp',
         '../gpu/src/GrPathRenderer.cpp',
-        '../gpu/src/GrPathRenderer.h',
         '../gpu/src/GrPathUtils.cpp',
         '../gpu/src/GrPathUtils.h',
         '../gpu/src/GrRectanizer.cpp',

samplecode/SampleApp.cpp

@@ -24,7 +24,6 @@
 #include "SkTypeface.h"
 
 #include "GrGLInterface.h"
-#include "GrRenderTarget.h"
 
 #include "SkPDFDevice.h"
 #include "SkPDFDocument.h"