diff options
author | 2015-03-19 06:08:31 -0700 | |
---|---|---|
committer | 2015-03-19 06:08:31 -0700 | |
commit | a7634619ec653e94a8a506ca86c233753d10510e (patch) | |
tree | b4e294bbf08418e55c852cba877c4e2ab6f41444 /src/gpu/GrFontCache.h | |
parent | 9b77ddde08efe702256355a333cf31ade8f15bb0 (diff) |
Ensure that we use different glyph entries for regular and df text.
Currently if we switch between regular text and df text while using
the same GrContext, they may use the same entry in the Ganesh font cache,
which is incorrect. This change ensures that they will have different entries.
Committed: https://skia.googlesource.com/skia/+/8dc58edd71c11f232860724dfa3b566895478034
Review URL: https://codereview.chromium.org/1020593003
Diffstat (limited to 'src/gpu/GrFontCache.h')
-rw-r--r-- | src/gpu/GrFontCache.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/GrFontCache.h b/src/gpu/GrFontCache.h index 6ee39d0c47..31e56016db 100644 --- a/src/gpu/GrFontCache.h +++ b/src/gpu/GrFontCache.h @@ -72,7 +72,6 @@ private: SkVarAlloc fPool; GrFontCache* fFontCache; - bool fUseDistanceField; GrAtlas::ClientPlotUsage fPlotUsage; @@ -86,7 +85,7 @@ public: GrFontCache(GrGpu*); ~GrFontCache(); - inline GrTextStrike* getStrike(GrFontScaler* scaler, bool useDistanceField) { + inline GrTextStrike* getStrike(GrFontScaler* scaler) { this->validate(); GrTextStrike* strike = fCache.find(*(scaler->getKey())); @@ -102,7 +101,6 @@ public: strike->fPrev = NULL; fHead = strike; } - strike->fUseDistanceField = useDistanceField; this->validate(); return strike; } |