Improve horizontal baseline detection.

src/core/SkScalerContext.h

Index: src/core/SkScalerContext.h
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index 302698ee4e581548179bea34ed021af4bc4a87fa..9249bfb2a9dd1cffef099f5148259c587ac55f1e 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -20,6 +20,12 @@ class SkMaskFilter;
 class SkPathEffect;
 class SkRasterizer;
 
+enum SkAxisAlignment {
+    kNone_SkAxisAlignment,
+    kX_SkAxisAlignment,
+    kY_SkAxisAlignment
+};
+
 /*
  *  To allow this to be forward-declared, it must be its own typename, rather
  *  than a nested struct inside SkScalerContext (where it started).
@@ -245,6 +251,13 @@ public:
 
     const Rec& getRec() const { return fRec; }
 
+    /**

[herb_g, 2016/02/29 18:37:10]

Do you want *'s aligned vertically?

[bungeman-skia, 2016/02/29 19:21:20]

So while we have a vertical bit on paint and we kinda need to support it for the
time being, we don't really support it everywhere. All the 'vertical' text in
Chrome and Android is actually positioned horizontal text.

+    *  Return the axis (if any) that the baseline for horizontal text should land on.
+    *  As an example, the identity matrix will return kX_SkAxisAlignment
+    */
+    SkAxisAlignment computeAxisAlignmentForHText();
+
+
 protected:
     Rec         fRec;
 
@@ -340,22 +353,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-enum SkAxisAlignment {
-    kNone_SkAxisAlignment,
-    kX_SkAxisAlignment,
-    kY_SkAxisAlignment
-};
-
-/**
- *  Return the axis (if any) that the baseline for horizontal text will land on
- *  after running through the specified matrix.
- *
- *  As an example, the identity matrix will return kX_SkAxisAlignment
- */
-SkAxisAlignment SkComputeAxisAlignmentForHText(const SkMatrix& matrix);
-
-///////////////////////////////////////////////////////////////////////////////
-
 SkPaint::Hinting SkScalerContextRec::getHinting() const {
     unsigned hint = (fFlags & SkScalerContext::kHinting_Mask) >>
                                             SkScalerContext::kHinting_Shift;