summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 17:21:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 16:25:15 +0000
commitc551f43206405019121bd2b2c93714319a0a3300 (patch)
tree1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc
parent7961cea6d1041e3e454dae6a1da660b453efd238 (diff)
downloadqtwebengine-chromium-c551f43206405019121bd2b2c93714319a0a3300.tar.gz
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc b/chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc
index e46dfec3c15..f71b93bbf59 100644
--- a/chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc
+++ b/chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc
@@ -182,6 +182,12 @@ void FontBuilder::SetKerning(FontDescription::Kerning kerning) {
font_description_.SetKerning(kerning);
}
+void FontBuilder::SetFontOpticalSizing(OpticalSizing font_optical_sizing) {
+ Set(PropertySetFlag::kFontOpticalSizing);
+
+ font_description_.SetFontOpticalSizing(font_optical_sizing);
+}
+
void FontBuilder::SetFontSmoothing(FontSmoothingMode foont_smoothing_mode) {
Set(PropertySetFlag::kFontSmoothing);
@@ -238,7 +244,8 @@ float FontBuilder::GetComputedSizeFromSpecifiedSize(
float specified_size) {
DCHECK(document_);
float zoom_factor = effective_zoom;
- // FIXME: Why is this here!!!!?!
+ // Apply the text zoom factor preference. The preference is exposed in
+ // accessibility settings in Chrome for Android to improve readability.
if (LocalFrame* frame = document_->GetFrame())
zoom_factor *= frame->TextZoomFactor();
@@ -379,6 +386,8 @@ void FontBuilder::UpdateFontDescription(FontDescription& description,
description.SetTextRendering(font_description_.TextRendering());
if (IsSet(PropertySetFlag::kKerning))
description.SetKerning(font_description_.GetKerning());
+ if (IsSet(PropertySetFlag::kFontOpticalSizing))
+ description.SetFontOpticalSizing(font_description_.FontOpticalSizing());
if (IsSet(PropertySetFlag::kFontSmoothing))
description.SetFontSmoothing(font_description_.FontSmoothing());
if (IsSet(PropertySetFlag::kTextOrientation) ||