aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/text/GrTextUtils.h
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-05-17 13:18:03 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-17 13:18:03 -0700
commitc2878e23d405e7ae77f6110602ad75ce1f6b941c (patch)
tree60ca9f98e87015f69e83fcde49230418823191cd /src/gpu/text/GrTextUtils.h
parentd3cdbcad65673596ae37e65fec842d8d4d81c5a7 (diff)
Remove GrFontScaler class.
This class is now effectively a set of helpers for interacting with a SkGlyphCache by GrBatchTextStrike. The class is deleted and the code is made into static functions in GrBatchFontCache.cpp BUG=chromium:608566 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1985163002 Review-Url: https://codereview.chromium.org/1985163002
Diffstat (limited to 'src/gpu/text/GrTextUtils.h')
-rw-r--r--src/gpu/text/GrTextUtils.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/text/GrTextUtils.h b/src/gpu/text/GrTextUtils.h
index 7823473f77..c218ab7da1 100644
--- a/src/gpu/text/GrTextUtils.h
+++ b/src/gpu/text/GrTextUtils.h
@@ -18,7 +18,6 @@ class GrBatchTextStrike;
class GrClip;
class GrContext;
class GrDrawContext;
-class GrFontScaler;
class GrShaderCaps;
class SkGlyph;
class SkMatrix;
@@ -85,7 +84,6 @@ public:
static bool ShouldDisableLCD(const SkPaint& paint);
- static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache);
static uint32_t FilterTextFlags(const SkSurfaceProps& surfaceProps, const SkPaint& paint);
private:
@@ -96,12 +94,12 @@ private:
static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
GrBatchTextStrike**, const SkGlyph&, int left, int top,
- GrColor color, GrFontScaler*);
+ GrColor color, SkGlyphCache*);
static bool DfAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
GrBatchTextStrike**, const SkGlyph&,
SkScalar sx, SkScalar sy, GrColor color,
- GrFontScaler* scaler,
+ SkGlyphCache* cache,
SkScalar textRatio, const SkMatrix& viewMatrix);
};