| Index: src/gpu/GrStencilAndCoverTextContext.h
|
| diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
|
| index 4c57d3cb81d251227ebc959b027515562a3027fc..44b33a593dc95f1ce3f09f54aab0f0fa5149d24e 100644
|
| --- a/src/gpu/GrStencilAndCoverTextContext.h
|
| +++ b/src/gpu/GrStencilAndCoverTextContext.h
|
| @@ -30,27 +30,6 @@ public:
|
| virtual ~GrStencilAndCoverTextContext();
|
|
|
| private:
|
| - enum RenderMode {
|
| - /**
|
| - * This is the render mode used by drawText(), which is mainly used by
|
| - * the Skia unit tests. It tries match the other text backends exactly,
|
| - * with the exception of not implementing LCD text, and doing anti-
|
| - * aliasing with the built-in MSAA.
|
| - */
|
| - kMaxAccuracy_RenderMode,
|
| -
|
| - /**
|
| - * This is the render mode used by drawPosText(). It ignores hinting and
|
| - * LCD text, even if the client provided positions for hinted glyphs,
|
| - * and renders from a canonically-sized, generic set of paths for the
|
| - * given typeface. In the future we should work out a system for the
|
| - * client to know it should not provide hinted glyph positions. This
|
| - * render mode also tries to use GPU stroking for fake bold, even when
|
| - * SK_USE_FREETYPE_EMBOLDEN is set.
|
| - */
|
| - kMaxPerformance_RenderMode,
|
| - };
|
| -
|
| SkScalar fTextRatio;
|
| float fTextInverseRatio;
|
| SkGlyphCache* fGlyphCache;
|
| @@ -61,10 +40,8 @@ private:
|
| SkSTArray<32, uint16_t, true> fFallbackIndices;
|
| SkSTArray<32, SkPoint, true> fFallbackPositions;
|
|
|
| - SkMatrix fContextInitialMatrix;
|
| SkMatrix fViewMatrix;
|
| SkMatrix fLocalMatrix;
|
| - bool fUsingDeviceSpaceGlyphs;
|
| SkAutoTUnref<GrRenderTarget> fRenderTarget;
|
| GrClip fClip;
|
| SkIRect fClipRect;
|
| @@ -88,10 +65,8 @@ private:
|
| const SkScalar pos[], int scalarsPerPosition,
|
| const SkPoint& offset, const SkIRect& regionClipBounds) override;
|
|
|
| - void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
|
| - size_t textByteLength, RenderMode, const SkMatrix& viewMatrix,
|
| - const SkIRect& regionClipBounds);
|
| - bool mapToFallbackContext(SkMatrix* inverse);
|
| + void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&, size_t textByteLength,
|
| + const SkMatrix& viewMatrix, const SkIRect& regionClipBounds);
|
| void appendGlyph(const SkGlyph&, const SkPoint&);
|
| void flush(GrDrawContext* dc);
|
| void finish(GrDrawContext* dc);
|
|
|