diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-03-23 14:01:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-23 19:23:21 +0000 |
| commit | 3318da5d1aa19533dd034f90d4bc29a2d2e86b66 (patch) | |
| tree | a3e81412184977d9eba932f1d4eb06bf3d2adfd8 /src | |
| parent | 9f01e38ad1d6377a734c14ac7ef45265598a04d0 (diff) | |
Replace Thinkness with Thickness.
The FontMetricsFlags::kUnderlineThinknessIsValid_Flag has a typo in it.
Fortunately no user currently uses this enumeration value by name but
instead uses the getter so the name can be updated.
BUG=skia:6174
Change-Id: I810260d826482de1da8876cd9739d24b3bfb0f95
Reviewed-on: https://skia-review.googlesource.com/10050
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 5489996033..f32f4e3e93 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -1388,7 +1388,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics underlinePosition = -SkIntToScalar(face->underline_position + face->underline_thickness / 2) / upem; - metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag; + metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThicknessIsValid_Flag; metrics->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag; // we may be able to synthesize x_height and cap_height from outline @@ -1417,7 +1417,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics underlineThickness = 0; underlinePosition = 0; - metrics->fFlags &= ~SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag; + metrics->fFlags &= ~SkPaint::FontMetrics::kUnderlineThicknessIsValid_Flag; metrics->fFlags &= ~SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag; } else { sk_bzero(metrics, sizeof(*metrics)); diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index a9b8ccd91c..ca236a3f2d 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -1306,7 +1306,7 @@ void SkScalerContext_Mac::generateFontMetrics(SkPaint::FontMetrics* metrics) { metrics->fUnderlineThickness = CGToScalar( CTFontGetUnderlineThickness(fCTFont.get())); metrics->fUnderlinePosition = -CGToScalar( CTFontGetUnderlinePosition(fCTFont.get())); - metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag; + metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThicknessIsValid_Flag; metrics->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag; // See https://bugs.chromium.org/p/skia/issues/detail?id=6203 diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 296b9d3b98..25c608878d 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -1009,7 +1009,7 @@ void SkScalerContext_GDI::generateFontMetrics(SkPaint::FontMetrics* metrics) { metrics->fUnderlineThickness = SkIntToScalar(otm.otmsUnderscoreSize); metrics->fUnderlinePosition = -SkIntToScalar(otm.otmsUnderscorePosition); - metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag; + metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThicknessIsValid_Flag; metrics->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag; metrics->fXHeight = SkIntToScalar(otm.otmsXHeight); diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp index 3f5fc99c50..1fc067ee84 100644 --- a/src/ports/SkScalerContext_win_dw.cpp +++ b/src/ports/SkScalerContext_win_dw.cpp @@ -621,7 +621,7 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* metrics) { metrics->fUnderlineThickness = fTextSizeRender * SkIntToScalar(dwfm.underlineThickness) / upem; metrics->fUnderlinePosition = -(fTextSizeRender * SkIntToScalar(dwfm.underlinePosition) / upem); - metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag; + metrics->fFlags |= SkPaint::FontMetrics::kUnderlineThicknessIsValid_Flag; metrics->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag; if (this->getDWriteTypeface()->fDWriteFontFace1.get()) { |