summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/platform/fonts
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-08-22 10:58:53 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-12-03 17:27:49 +0100
commitf9f12dce3f44304a451d3213f75e95602bff57ab (patch)
treed056529985eac1bbadf75c9465509805682a5b0c /chromium/third_party/blink/renderer/platform/fonts
parent990f98a2ec0173c6db364261356074d52ca312e0 (diff)
downloadqtwebengine-chromium-f9f12dce3f44304a451d3213f75e95602bff57ab.tar.gz
Fix medium hinting on Linux with fontconfig and freetype
Skia freetype will enforce slight hinting in SkTypeface_FreeType::onFilterRec when subpixel positioning is enabled. To avoid overriding medium hinting with slight, we should not enable subpixel positioning for medium hinting similar to how it is avoided for full hinting as well. Change-Id: I4a229cf2b8827c11f33789d1c35c2d0eaeaed0ae Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/fonts')
-rw-r--r--chromium/third_party/blink/renderer/platform/fonts/web_font_render_style.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/platform/fonts/web_font_render_style.cc b/chromium/third_party/blink/renderer/platform/fonts/web_font_render_style.cc
index a8b68cd62f5..e5e75471249 100644
--- a/chromium/third_party/blink/renderer/platform/fonts/web_font_render_style.cc
+++ b/chromium/third_party/blink/renderer/platform/fonts/web_font_render_style.cc
@@ -110,11 +110,11 @@ void WebFontRenderStyle::ApplyToSkFont(SkFont* font,
font->setEdging(SkFont::Edging::kAlias);
}
- // Force-enable subpixel positioning, except when full hinting is requested on
- // low-dpi screen or when running web tests.
+ // Force-enable subpixel positioning, except when normal or full hinting is
+ // requested on low-dpi screen or when running web tests.
bool force_subpixel_positioning =
!WebTestSupport::IsRunningWebTest() &&
- (sk_hint_style != SkFontHinting::kFull || device_scale_factor > 1.0f);
+ (sk_hint_style < SkFontHinting::kNormal || device_scale_factor > 1.0f);
font->setSubpixel(force_subpixel_positioning || use_subpixel_positioning);