diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-01 20:12:26 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-01 20:12:26 +0000 |
| commit | 0bc406df48ac6f358ab8dcff08f71fe9c32b79de (patch) | |
| tree | 605cbca3d7f3d1261a651d36ee02884846f22611 /src/ports/SkFontHost_mac.cpp | |
| parent | 370a89980b2d38a6d01903b484bf404d6c48b496 (diff) | |
Adding code to calculate Underline Thickness from Font Metrics, this will be useful when Skia is used with Blink/Chrome. Blink changes are uploaded with code change in patch https://codereview.chromium.org/147703002/
BUG=skia:
R=reed@android.com, edisonn@google.com, reed@google.com, mtklein@google.com, mtklein@chromium.org, bungeman@google.com
Author: h.joshi@samsung.com
Review URL: https://codereview.chromium.org/152073003
git-svn-id: http://skia.googlecode.com/svn/trunk@13635 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkFontHost_mac.cpp')
| -rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index ac0e365e2e..26d30d726a 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -1379,6 +1379,11 @@ void SkScalerContext_Mac::generateFontMetrics(SkPaint::FontMetrics* mx, theMetrics.fXMin = CGToScalar( CGRectGetMinX_inline(theBounds)); theMetrics.fXMax = CGToScalar( CGRectGetMaxX_inline(theBounds)); theMetrics.fXHeight = CGToScalar( CTFontGetXHeight(fCTFont)); + theMetrics.fUnderlineThickness = CGToScalar( CTFontGetUnderlineThickness(fCTFont)); + theMetrics.fUnderlinePosition = -CGToScalar( CTFontGetUnderlinePosition(fCTFont)); + + theMetrics.fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag; + theMetrics.fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag; if (mx != NULL) { *mx = theMetrics; |