Improve horizontal baseline detection.

src/core/SkFindAndPlaceGlyph.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFindAndPositionGlyph_DEFINED
 #define SkFindAndPositionGlyph_DEFINED
 
@@ skipping 569 matching lines @@
     }
 };
 
 template<typename ProcessOneGlyph>
 inline void SkFindAndPlaceGlyph::ProcessPosText(
     SkPaint::TextEncoding textEncoding, const char text[], size_t byteLength,
     SkPoint offset, const SkMatrix& matrix, const SkScalar pos[], int scalarsPerPosition,
     SkPaint::Align textAlignment,
     SkGlyphCache* cache, ProcessOneGlyph&& processOneGlyph) {
 
-    SkAxisAlignment axisAlignment = SkComputeAxisAlignmentForHText(matrix);
+    SkAxisAlignment axisAlignment = cache->getScalerContext()->computeAxisAlignmentForHText();
     uint32_t mtype = matrix.getType();
-
     LookupGlyph glyphFinder(textEncoding, cache);
 
     // Specialized code for handling the most common case for blink. The while loop is totally
     // de-virtualized.
     if (scalarsPerPosition == 1
         && textAlignment == SkPaint::kLeft_Align
         && axisAlignment == kX_SkAxisAlignment
         && cache->isSubpixel()
         && mtype <= SkMatrix::kTranslate_Mask) {
         typedef GlyphFindAndPlaceSubpixel<
@@ skipping 100 matching lines @@
 
         if (textAlignment == SkPaint::kCenter_Align) {
             stop *= SK_ScalarHalf;
         }
         offset -= stop;
     }
 
     GlyphFindAndPlace<ProcessOneGlyph> findAndPosition{
         [&](typename GlyphFindAndPlace<ProcessOneGlyph>::Variants* to_init) {
             if (cache->isSubpixel()) {
-                SkAxisAlignment axisAlignment = SkComputeAxisAlignmentForHText(matrix);
+                SkAxisAlignment axisAlignment =
+                    cache->getScalerContext()->computeAxisAlignmentForHText();
                 InitSubpixel<ProcessOneGlyph, SkPaint::kLeft_Align>(
                     to_init, axisAlignment, glyphFinder);
             } else {
                 to_init->template initialize<
                     GlyphFindAndPlaceFullPixel<
                         ProcessOneGlyph, SkPaint::kLeft_Align, kUseKerning>>(glyphFinder);
             }
         }
     };
 
     const char* stop = text + byteLength;
     SkPoint current = offset;
     while (text < stop) {
         current =
             findAndPosition->findAndPositionGlyph(
                 &text, current, std::forward<ProcessOneGlyph>(processOneGlyph));
 
     }
 }
 
 #endif  // SkFindAndPositionGlyph_DEFINED