commit 080a928a249115ec425771dd055682edf74d5258
author Jim Van Verth <jvanverth@google.com> Fri Mar 02 10:41:43 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 02 16:03:20 2018 +0000
tree f90fb3234de2e92d0251960abba0957e2b9e9251
parent e28f9c65f614b605afdfb17d345d386b35f3f3b1

Various fixes for scaled emojis

Bug: skia:7562
Change-Id: I66cf290ca4541ceae7ee1009a1524046a2c5893e
Reviewed-on: https://skia-review.googlesource.com/111481
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/text/GrAtlasTextContext.h

diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h
index bcdc9fd..2f95d9a 100644
--- a/src/gpu/text/GrAtlasTextContext.h
+++ b/src/gpu/text/GrAtlasTextContext.h
@@ -61,14 +61,14 @@
     class FallbackTextHelper {
     public:
         FallbackTextHelper(const SkMatrix& viewMatrix,
-                           SkScalar textSize,
-                           SkScalar maxTextSize,
+                           const SkPaint& pathPaint,
+                           const GrGlyphCache* glyphCache,
                            SkScalar textRatio)
             : fViewMatrix(viewMatrix)
+            , fTextSize(pathPaint.getTextSize())
+            , fMaxTextSize(glyphCache->getGlyphSizeLimit())
             , fTextRatio(textRatio)
-            , fTextSize(textSize)
-            , fMaxTextSize(maxTextSize)
-            , fScaledFallbackTextSize(maxTextSize)
+            , fScaledFallbackTextSize(fMaxTextSize)
             , fUseScaledFallback(false) {
             fMaxScale = viewMatrix.getMaxScale();
         }
@@ -82,9 +82,9 @@
         SkTDArray<SkPoint> fFallbackPos;
 
         const SkMatrix& fViewMatrix;
-        SkScalar fTextRatio;
         SkScalar fTextSize;
         SkScalar fMaxTextSize;
+        SkScalar fTextRatio;
         SkScalar fScaledFallbackTextSize;
         SkScalar fMaxScale;
         bool fUseScaledFallback;