diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-23 19:01:36 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-23 19:01:36 +0000 |
| commit | f6f56878bc96386882721b15ba610984185d3dc9 (patch) | |
| tree | 0d6835f9dcbb1a7924a32c16b488d97f9fa65cbf | |
| parent | 1878a44c7490e3312a3b617fa03d2cf297b791e0 (diff) | |
Clarify kAutohinting is kForceAutohinting.
BUG=skia:2047
R=reed@google.com
Review URL: https://codereview.chromium.org/139943004
git-svn-id: http://skia.googlecode.com/svn/trunk@13156 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkPaint.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkScalerContext.h | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 7 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 2 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_win_dw.cpp | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index af032d001e..f576015ba0 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -1647,7 +1647,7 @@ void SkScalerContext::MakeRec(const SkPaint& paint, flags |= SkScalerContext::kSubpixelPositioning_Flag; } if (paint.isAutohinted()) { - flags |= SkScalerContext::kAutohinting_Flag; + flags |= SkScalerContext::kForceAutohinting_Flag; } if (paint.isVerticalText()) { flags |= SkScalerContext::kVertical_Flag; diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h index e4950edee3..63b1f186f1 100644 --- a/src/core/SkScalerContext.h +++ b/src/core/SkScalerContext.h @@ -122,7 +122,7 @@ public: kEmbeddedBitmapText_Flag = 0x0004, kEmbolden_Flag = 0x0008, kSubpixelPositioning_Flag = 0x0010, - kAutohinting_Flag = 0x0020, + kForceAutohinting_Flag = 0x0020, // Use auto instead of bytcode hinting if hinting. kVertical_Flag = 0x0040, // together, these two flags resulting in a two bit value which matches diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 97046f4ba8..79520a8a03 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -915,13 +915,12 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, loadFlags = FT_LOAD_TARGET_LIGHT; // This implies FORCE_AUTOHINT break; case SkPaint::kNormal_Hinting: - if (fRec.fFlags & SkScalerContext::kAutohinting_Flag) + if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) { loadFlags = FT_LOAD_FORCE_AUTOHINT; - else - loadFlags = FT_LOAD_NO_AUTOHINT; + } break; case SkPaint::kFull_Hinting: - if (fRec.fFlags & SkScalerContext::kAutohinting_Flag) { + if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) { loadFlags = FT_LOAD_FORCE_AUTOHINT; break; } diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index fe3fd06981..c27bd67443 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -1832,7 +1832,7 @@ void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { } unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | - SkScalerContext::kAutohinting_Flag | + SkScalerContext::kForceAutohinting_Flag | SkScalerContext::kLCD_BGROrder_Flag | SkScalerContext::kLCD_Vertical_Flag; diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index aaf667a260..9029c2b43d 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -2420,7 +2420,7 @@ void LogFontTypeface::onFilterRec(SkScalerContextRec* rec) const { } unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | - SkScalerContext::kAutohinting_Flag | + SkScalerContext::kForceAutohinting_Flag | SkScalerContext::kEmbeddedBitmapText_Flag | SkScalerContext::kEmbolden_Flag | SkScalerContext::kLCD_BGROrder_Flag | diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index 438bf1980c..b9f69bdb3c 100644 --- a/src/ports/SkFontHost_win_dw.cpp +++ b/src/ports/SkFontHost_win_dw.cpp @@ -1372,7 +1372,7 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const { } unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | - SkScalerContext::kAutohinting_Flag | + SkScalerContext::kForceAutohinting_Flag | SkScalerContext::kEmbeddedBitmapText_Flag | SkScalerContext::kEmbolden_Flag | SkScalerContext::kLCD_BGROrder_Flag | |