| Index: src/gpu/GrPathRendering.h
|
| diff --git a/src/gpu/GrPathRendering.h b/src/gpu/GrPathRendering.h
|
| index cd42206f436ca9be9279f57ac15428ce06a353f5..3e2cfc6c9aefb345bff2442ebd7b2d11d412ba3a 100644
|
| --- a/src/gpu/GrPathRendering.h
|
| +++ b/src/gpu/GrPathRendering.h
|
| @@ -34,17 +34,7 @@ class GrPathRendering {
|
| public:
|
| virtual ~GrPathRendering() { }
|
|
|
| - // No native support for inverse at this time
|
| - enum FillType {
|
| - /** Specifies that "inside" is computed by a non-zero sum of signed
|
| - edge crossings
|
| - */
|
| - kWinding_FillType,
|
| - /** Specifies that "inside" is computed by an odd number of edge
|
| - crossings
|
| - */
|
| - kEvenOdd_FillType,
|
| - };
|
| + typedef GrPathRange::PathIndexType PathIndexType;
|
|
|
| enum PathTransformType {
|
| kNone_PathTransformType, //!< []
|
| @@ -74,6 +64,18 @@ public:
|
| }
|
| }
|
|
|
| + // No native support for inverse at this time
|
| + enum FillType {
|
| + /** Specifies that "inside" is computed by a non-zero sum of signed
|
| + edge crossings
|
| + */
|
| + kWinding_FillType,
|
| + /** Specifies that "inside" is computed by an odd number of edge
|
| + crossings
|
| + */
|
| + kEvenOdd_FillType,
|
| + };
|
| +
|
| /**
|
| * Creates a new gpu path, based on the specified path and stroke and returns it.
|
| * The caller owns a ref on the returned path which must be balanced by a call to unref.
|
| @@ -126,8 +128,8 @@ public:
|
|
|
| virtual void stencilPath(const GrPath*, const GrStencilSettings&) = 0;
|
| virtual void drawPath(const GrPath*, const GrStencilSettings&) = 0;
|
| - virtual void drawPaths(const GrPathRange*, const uint32_t indices[], int count,
|
| - const float transforms[], PathTransformType,
|
| + virtual void drawPaths(const GrPathRange*, const void* indices, PathIndexType,
|
| + const float transformValues[], PathTransformType, int count,
|
| const GrStencilSettings&) = 0;
|
| protected:
|
| GrPathRendering() { }
|
|
|