| Index: src/gpu/text/GrStencilAndCoverTextContext.h
|
| diff --git a/src/gpu/text/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h
|
| index 9b29719cb7629c60e34bab8bd47601b5f0d41d8b..5001e050e818165178505cb49f4a6c67a739984d 100644
|
| --- a/src/gpu/text/GrStencilAndCoverTextContext.h
|
| +++ b/src/gpu/text/GrStencilAndCoverTextContext.h
|
| @@ -11,6 +11,7 @@
|
| #include "GrDrawContext.h"
|
| #include "GrStyle.h"
|
| #include "SkDrawFilter.h"
|
| +#include "SkFont.h"
|
| #include "SkTextBlob.h"
|
| #include "SkTHash.h"
|
| #include "SkTInternalLList.h"
|
| @@ -87,7 +88,7 @@ private:
|
|
|
| size_t computeSizeInCache() const;
|
|
|
| - bool isAntiAlias() const { return fFont.isAntiAlias(); }
|
| + bool isAntiAlias() const { return true; }
|
|
|
| private:
|
| typedef GrDrawPathRangeBatch::InstanceData InstanceData;
|
| @@ -97,7 +98,11 @@ private:
|
| void appendGlyph(const SkGlyph&, const SkPoint&, FallbackBlobBuilder*);
|
|
|
| GrStyle fStyle;
|
| - SkPaint fFont;
|
| +
|
| + sk_sp<SkFont> fFont;
|
| + SkTextEncoding fTextEncoding;
|
| + SkPaint::Align fTextAlign;
|
| +
|
| SkScalar fTextRatio;
|
| float fTextInverseRatio;
|
| bool fUsingRawGlyphPaths;
|
|
|