| Index: include/gpu/GrDrawContext.h
|
| diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
|
| index bf6f2a89f3adc8d6ceb34b31289ae2007c1dd212..dac918364707007716e20389802e0afc55511d78 100644
|
| --- a/include/gpu/GrDrawContext.h
|
| +++ b/include/gpu/GrDrawContext.h
|
| @@ -16,12 +16,11 @@
|
| class GrClip;
|
| class GrContext;
|
| class GrDrawBatch;
|
| +class GrDrawPathBatchBase;
|
| class GrDrawingManager;
|
| class GrDrawTarget;
|
| class GrPaint;
|
| class GrPathProcessor;
|
| -class GrPathRange;
|
| -class GrPathRangeDraw;
|
| class GrPipelineBuilder;
|
| class GrRenderTarget;
|
| class GrStrokeInfo;
|
| @@ -63,17 +62,6 @@ public:
|
| SkScalar x, SkScalar y,
|
| SkDrawFilter*, const SkIRect& clipBounds);
|
|
|
| - // drawPathsFromRange is thanks to GrStencilAndCoverTextContext
|
| - // TODO: remove once path batches can be created external to GrDrawTarget.
|
| - void drawPathsFromRange(const GrPipelineBuilder*,
|
| - const SkMatrix& viewMatrix,
|
| - const SkMatrix& localMatrix,
|
| - GrColor color,
|
| - GrPathRange* range,
|
| - GrPathRangeDraw* draw,
|
| - int /*GrPathRendering::FillType*/ fill,
|
| - const SkRect& bounds);
|
| -
|
| /**
|
| * Provides a perfomance hint that the render target's contents are allowed
|
| * to become undefined.
|
| @@ -274,6 +262,14 @@ public:
|
| */
|
| void drawBatch(const GrClip&, const GrPaint&, GrDrawBatch*);
|
|
|
| + /**
|
| + * Draws a path batch. This needs to be separate from drawBatch because we install path stencil
|
| + * settings late.
|
| + *
|
| + * TODO: Figure out a better model that allows us to roll this method into drawBatch.
|
| + */
|
| + void drawPathBatch(const GrPipelineBuilder&, GrDrawPathBatchBase*);
|
| +
|
| int width() const { return fRenderTarget->width(); }
|
| int height() const { return fRenderTarget->height(); }
|
| int numColorSamples() const { return fRenderTarget->numColorSamples(); }
|
|
|