commit f856fd1ccdd839646159767f6aa9a2f2a1b97f04
author Brian Salomon <bsalomon@google.com> Fri Dec 16 14:24:34 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 19:48:35 2016 +0000
tree c5e31835dcbaad536bba1f8383abfaca86af5e1c
parent 884300dca5531f60535501424bbd86b30e20450a

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>

src/gpu/text/GrTextUtils.cpp

diff --git a/src/gpu/text/GrTextUtils.cpp b/src/gpu/text/GrTextUtils.cpp
index 7f7dc68..5793ade 100644
--- a/src/gpu/text/GrTextUtils.cpp
+++ b/src/gpu/text/GrTextUtils.cpp
@@ -7,8 +7,8 @@
 
 #include "GrTextUtils.h"
 
+#include "GrAtlasGlyphCache.h"
 #include "GrAtlasTextBlob.h"
-#include "GrBatchFontCache.h"
 #include "GrBlurUtils.h"
 #include "GrCaps.h"
 #include "GrContext.h"
@@ -38,7 +38,7 @@
 };
 
 void GrTextUtils::DrawBmpText(GrAtlasTextBlob* blob, int runIndex,
-                              GrBatchFontCache* fontCache,
+                              GrAtlasGlyphCache* fontCache,
                               const SkSurfaceProps& props, const SkPaint& skPaint,
                               GrColor color, uint32_t scalerContextFlags,
                               const SkMatrix& viewMatrix,
@@ -54,7 +54,7 @@
     // Ensure the blob is set for bitmaptext
     blob->setHasBitmap();
 
-    GrBatchTextStrike* currStrike = nullptr;
+    GrAtlasTextStrike* currStrike = nullptr;
 
     SkGlyphCache* cache = blob->setupCache(runIndex, props, scalerContextFlags, skPaint,
                                            &viewMatrix);
@@ -75,7 +75,7 @@
 }
 
 void GrTextUtils::DrawBmpPosText(GrAtlasTextBlob* blob, int runIndex,
-                                 GrBatchFontCache* fontCache,
+                                 GrAtlasGlyphCache* fontCache,
                                  const SkSurfaceProps& props, const SkPaint& skPaint,
                                  GrColor color, uint32_t scalerContextFlags,
                                  const SkMatrix& viewMatrix,
@@ -93,7 +93,7 @@
     // Ensure the blob is set for bitmaptext
     blob->setHasBitmap();
 
-    GrBatchTextStrike* currStrike = nullptr;
+    GrAtlasTextStrike* currStrike = nullptr;
 
     SkGlyphCache* cache = blob->setupCache(runIndex, props, scalerContextFlags, skPaint,
                                            &viewMatrix);
@@ -115,8 +115,8 @@
 }
 
 void GrTextUtils::BmpAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
-                                 GrBatchFontCache* fontCache,
-                                 GrBatchTextStrike** strike, const SkGlyph& skGlyph,
+                                 GrAtlasGlyphCache* fontCache,
+                                 GrAtlasTextStrike** strike, const SkGlyph& skGlyph,
                                  int vx, int vy, GrColor color, SkGlyphCache* cache) {
     if (!*strike) {
         *strike = fontCache->getStrike(cache);
@@ -241,7 +241,7 @@
 }
 
 void GrTextUtils::DrawDFText(GrAtlasTextBlob* blob, int runIndex,
-                             GrBatchFontCache* fontCache, const SkSurfaceProps& props,
+                             GrAtlasGlyphCache* fontCache, const SkSurfaceProps& props,
                              const SkPaint& skPaint, GrColor color, uint32_t scalerContextFlags,
                              const SkMatrix& viewMatrix,
                              const char text[], size_t byteLength,
@@ -316,7 +316,7 @@
 }
 
 void GrTextUtils::DrawDFPosText(GrAtlasTextBlob* blob, int runIndex,
-                                GrBatchFontCache* fontCache, const SkSurfaceProps& props,
+                                GrAtlasGlyphCache* fontCache, const SkSurfaceProps& props,
                                 const SkPaint& origPaint,
                                 GrColor color, uint32_t scalerContextFlags,
                                 const SkMatrix& viewMatrix,
@@ -341,7 +341,7 @@
     blob->setHasDistanceField();
     blob->setSubRunHasDistanceFields(runIndex, origPaint.isLCDRenderText());
 
-    GrBatchTextStrike* currStrike = nullptr;
+    GrAtlasTextStrike* currStrike = nullptr;
 
     // We apply the fake-gamma by altering the distance in the shader, so we ignore the
     // passed-in scaler context flags. (It's only used when we fall-back to bitmap text).
@@ -426,8 +426,8 @@
     }
 }
 
-bool GrTextUtils::DfAppendGlyph(GrAtlasTextBlob* blob, int runIndex, GrBatchFontCache* cache,
-                                GrBatchTextStrike** strike, const SkGlyph& skGlyph,
+bool GrTextUtils::DfAppendGlyph(GrAtlasTextBlob* blob, int runIndex, GrAtlasGlyphCache* cache,
+                                GrAtlasTextStrike** strike, const SkGlyph& skGlyph,
                                 SkScalar sx, SkScalar sy, GrColor color,
                                 SkGlyphCache* glyphCache,
                                 SkScalar textRatio, const SkMatrix& viewMatrix) {