Index: src/gpu/GrGpu.h |
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h |
index 6a9dfa2b58038506912a9c6b9dedc7d75c014e15..b449f9eb17b4422d84e37aeaf01fa7ec88c5a3a0 100644 |
--- a/src/gpu/GrGpu.h |
+++ b/src/gpu/GrGpu.h |
@@ -124,7 +124,7 @@ public: |
* Creates a path object that can be stenciled using stencilPath(). It is |
* only legal to call this if the caps report support for path stenciling. |
*/ |
- GrPath* createPath(const SkPath& path); |
+ GrPath* createPath(const SkPath& path, const SkStrokeRec& stroke); |
/** |
* Returns an index buffer that can be used to render quads. |
@@ -343,7 +343,7 @@ protected: |
kDrawLines_DrawType, |
kDrawTriangles_DrawType, |
kStencilPath_DrawType, |
- kFillPath_DrawType, |
+ kDrawPath_DrawType, |
}; |
DrawType PrimTypeToDrawType(GrPrimitiveType type) { |
@@ -435,7 +435,7 @@ private: |
virtual GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&) = 0; |
virtual GrVertexBuffer* onCreateVertexBuffer(uint32_t size, bool dynamic) = 0; |
virtual GrIndexBuffer* onCreateIndexBuffer(uint32_t size, bool dynamic) = 0; |
- virtual GrPath* onCreatePath(const SkPath& path) = 0; |
+ virtual GrPath* onCreatePath(const SkPath& path, const SkStrokeRec&) = 0; |
// overridden by backend-specific derived class to perform the clear and |
// clearRect. NULL rect means clear whole target. |
@@ -446,7 +446,7 @@ private: |
// overridden by backend-specific derived class to perform the path stenciling. |
virtual void onGpuStencilPath(const GrPath*, SkPath::FillType) = 0; |
- virtual void onGpuFillPath(const GrPath*, SkPath::FillType) = 0; |
+ virtual void onGpuDrawPath(const GrPath*, SkPath::FillType) = 0; |
// overridden by backend-specific derived class to perform flush |
virtual void onForceRenderTargetFlush() = 0; |
@@ -489,10 +489,8 @@ private: |
// GrDrawTarget overrides |
virtual void onDraw(const DrawInfo&) SK_OVERRIDE; |
- virtual void onStencilPath(const GrPath* path, const SkStrokeRec& stroke, |
- SkPath::FillType) SK_OVERRIDE; |
- |
- virtual void onFillPath(const GrPath* path, const SkStrokeRec& stroke, SkPath::FillType, |
+ virtual void onStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE; |
+ virtual void onDrawPath(const GrPath*, SkPath::FillType, |
const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE; |
// readies the pools to provide vertex/index data. |