diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-16 14:24:34 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-16 19:48:35 +0000 |
| commit | f856fd1ccdd839646159767f6aa9a2f2a1b97f04 (patch) | |
| tree | c5e31835dcbaad536bba1f8383abfaca86af5e1c /src/gpu/text/GrTextUtils.h | |
| parent | 884300dca5531f60535501424bbd86b30e20450a (diff) | |
Rename GrBatchFontCache->GrAtlasGlyphCache
Change-Id: Ie21e18b631daa24e70df630b9f910213f62bdbdf
Reviewed-on: https://skia-review.googlesource.com/6164
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/text/GrTextUtils.h')
| -rw-r--r-- | src/gpu/text/GrTextUtils.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/text/GrTextUtils.h b/src/gpu/text/GrTextUtils.h index 9529c540f4..93a0c1f8f7 100644 --- a/src/gpu/text/GrTextUtils.h +++ b/src/gpu/text/GrTextUtils.h @@ -12,9 +12,9 @@ #include "SkPaint.h" #include "SkScalar.h" +class GrAtlasGlyphCache; class GrAtlasTextBlob; -class GrBatchFontCache; -class GrBatchTextStrike; +class GrAtlasTextStrike; class GrClip; class GrContext; class GrRenderTargetContext; @@ -35,14 +35,14 @@ class GrTextUtils { public: // Functions for appending BMP text to GrAtlasTextBlob static void DrawBmpText(GrAtlasTextBlob*, int runIndex, - GrBatchFontCache*, const SkSurfaceProps&, + GrAtlasGlyphCache*, const SkSurfaceProps&, const SkPaint&, GrColor, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y); static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex, - GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, + GrAtlasGlyphCache*, const SkSurfaceProps&, const SkPaint&, GrColor, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, @@ -53,14 +53,14 @@ public: const SkSurfaceProps& props, const GrShaderCaps& caps); static void DrawDFText(GrAtlasTextBlob* blob, int runIndex, - GrBatchFontCache*, const SkSurfaceProps&, + GrAtlasGlyphCache*, const SkSurfaceProps&, const SkPaint& skPaint, GrColor color, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y); static void DrawDFPosText(GrAtlasTextBlob* blob, int runIndex, - GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, + GrAtlasGlyphCache*, const SkSurfaceProps&, const SkPaint&, GrColor color, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, @@ -92,12 +92,12 @@ private: SkScalar* textRatio, const SkMatrix& viewMatrix); - static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*, - GrBatchTextStrike**, const SkGlyph&, int left, int top, + static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrAtlasGlyphCache*, + GrAtlasTextStrike**, const SkGlyph&, int left, int top, GrColor color, SkGlyphCache*); - static bool DfAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*, - GrBatchTextStrike**, const SkGlyph&, + static bool DfAppendGlyph(GrAtlasTextBlob*, int runIndex, GrAtlasGlyphCache*, + GrAtlasTextStrike**, const SkGlyph&, SkScalar sx, SkScalar sy, GrColor color, SkGlyphCache* cache, SkScalar textRatio, const SkMatrix& viewMatrix); |