Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Unified Diff: src/gpu/text/GrStencilAndCoverTextContext.h

Issue 2163483002: Use SkFont in GrStencilAndCoverTextContext (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update to ToT Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/gpu/text/GrStencilAndCoverTextContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | src/gpu/text/GrStencilAndCoverTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698