From fdd09c20027ab4e8e9b3e238b518c83bd2eda2b0 Mon Sep 17 00:00:00 2001 From: bensong Date: Tue, 29 Jul 2014 10:35:46 -0700 Subject: Revert of Add effect caching to distance field text. (https://codereview.chromium.org/424103002/) Reason for revert: breaking Chrome canary. Original issue's description: > Add effect caching to distance field text. > > This also is a step towards unifying GrDistanceFieldTextureEffect and GrDistanceFieldLCDTextureEffect. > > Committed: https://skia.googlesource.com/skia/+/137bac067306c5446bc4f9797bedc3bbaf302822 R=robertphillips@google.com, jvanverth@google.com TBR=jvanverth@google.com, robertphillips@google.com NOTREECHECKS=true NOTRY=true Author: bensong@google.com Review URL: https://codereview.chromium.org/424173002 --- src/gpu/GrDistanceFieldTextContext.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/gpu/GrDistanceFieldTextContext.h') diff --git a/src/gpu/GrDistanceFieldTextContext.h b/src/gpu/GrDistanceFieldTextContext.h index 672922d0d..7676fc164 100644 --- a/src/gpu/GrDistanceFieldTextContext.h +++ b/src/gpu/GrDistanceFieldTextContext.h @@ -34,17 +34,11 @@ private: SkScalar fTextRatio; bool fUseLCDText; bool fEnableDFRendering; - SkAutoTUnref fCachedEffect; - // Used to check whether fCachedEffect is still valid. - uint32_t fEffectTextureUniqueID; - SkColor fEffectColor; - uint32_t fEffectFlags; GrTexture* fGammaTexture; void init(const GrPaint&, const SkPaint&); void drawPackedGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*); void flushGlyphs(); // automatically called by destructor - void setupCoverageEffect(const SkColor& filteredColor); void finish(); enum { -- cgit v1.2.3