| Index: src/gpu/GrStencilAndCoverTextContext.h
|
| diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
|
| index b6e23bdb3feeb0b2bd5667d0c235716a22485ddb..dc32025501575777d5f2fb65cd7f1ac3d0b3914e 100644
|
| --- a/src/gpu/GrStencilAndCoverTextContext.h
|
| +++ b/src/gpu/GrStencilAndCoverTextContext.h
|
| @@ -27,6 +27,8 @@ public:
|
| GrStencilAndCoverTextContext(GrContext*, const SkDeviceProperties&);
|
| virtual ~GrStencilAndCoverTextContext();
|
|
|
| + virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
|
| +
|
| virtual void drawText(const GrPaint&, const SkPaint&, const char text[],
|
| size_t byteLength,
|
| SkScalar x, SkScalar y) SK_OVERRIDE;
|
| @@ -35,8 +37,6 @@ public:
|
| const SkScalar pos[], int scalarsPerPosition,
|
| const SkPoint& offset) SK_OVERRIDE;
|
|
|
| - virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
|
| -
|
| private:
|
| static const int kGlyphBufferSize = 1024;
|
|
|
| @@ -61,6 +61,18 @@ private:
|
| kMaxPerformance_RenderMode,
|
| };
|
|
|
| + GrDrawState::AutoRestoreEffects fStateRestore;
|
| + SkScalar fTextRatio;
|
| + float fTextInverseRatio;
|
| + SkGlyphCache* fGlyphCache;
|
| + GrPathRange* fGlyphs;
|
| + uint32_t fIndexBuffer[kGlyphBufferSize];
|
| + float fTransformBuffer[2 * kGlyphBufferSize];
|
| + GrDrawTarget::PathTransformType fTransformType;
|
| + int fPendingGlyphCount;
|
| + SkMatrix fContextInitialMatrix;
|
| + bool fNeedsDeviceSpaceGlyphs;
|
| +
|
| void init(const GrPaint&, const SkPaint&, size_t textByteLength,
|
| RenderMode, const SkPoint& textTranslate);
|
| void initGlyphs(SkGlyphCache* cache);
|
| @@ -69,17 +81,6 @@ private:
|
| void flush();
|
| void finish();
|
|
|
| - GrDrawState::AutoRestoreEffects fStateRestore;
|
| - SkScalar fTextRatio;
|
| - float fTextInverseRatio;
|
| - SkGlyphCache* fGlyphCache;
|
| - GrPathRange* fGlyphs;
|
| - uint32_t fIndexBuffer[kGlyphBufferSize];
|
| - float fTransformBuffer[2 * kGlyphBufferSize];
|
| - GrDrawTarget::PathTransformType fTransformType;
|
| - int fPendingGlyphCount;
|
| - SkMatrix fContextInitialMatrix;
|
| - bool fNeedsDeviceSpaceGlyphs;
|
| };
|
|
|
| #endif
|
|
|