commit 6bd8d1c44bbd99f63673677e4ef7618a1948e8e4
author bungeman <bungeman@google.com> Tue Jun 09 08:40:51 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 09 08:40:51 2015 -0700
tree 7f0e8f63ff5fd87f8d8d1d192976ce93038207f9
parent 2c55d7b7f3c2c834085d019bf6b1519b315c8aa1

Fill capHeight and maxCharWidth on Mac.

BUG=skia:3924

Review URL: https://codereview.chromium.org/1164423006

src/ports/SkFontHost_mac.cpp

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index a184a8b..22e2954 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -1393,7 +1393,9 @@
     metrics->fAvgCharWidth = CGToScalar( CGRectGetWidth_inline(theBounds));
     metrics->fXMin         = CGToScalar( CGRectGetMinX_inline(theBounds));
     metrics->fXMax         = CGToScalar( CGRectGetMaxX_inline(theBounds));
+    metrics->fMaxCharWidth = metrics->fXMax - metrics->fXMin;
     metrics->fXHeight      = CGToScalar( CTFontGetXHeight(fCTFont));
+    metrics->fCapHeight    = CGToScalar( CTFontGetCapHeight(fCTFont));
     metrics->fUnderlineThickness = CGToScalar( CTFontGetUnderlineThickness(fCTFont));
     metrics->fUnderlinePosition = -CGToScalar( CTFontGetUnderlinePosition(fCTFont));