diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/third_party/blink/renderer/core/css/resolver/font_builder.cc | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@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.cc | 4 |
1 files changed, 2 insertions, 2 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 feb1b80c2d2..dac42173c4e 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 @@ -344,7 +344,7 @@ void FontBuilder::UpdateAdjustedSize(FontDescription& font_description, font_description, style.EffectiveZoom(), adjusted_size); adjusted_size = TextAutosizer::ComputeAutosizedFontSize( - adjusted_size, style.TextAutosizingMultiplier()); + adjusted_size, style.TextAutosizingMultiplier(), style.EffectiveZoom()); font_description.SetAdjustedSize(adjusted_size); } @@ -354,7 +354,7 @@ void FontBuilder::UpdateComputedSize(FontDescription& font_description, GetComputedSizeFromSpecifiedSize(font_description, style.EffectiveZoom(), font_description.SpecifiedSize()); computed_size = TextAutosizer::ComputeAutosizedFontSize( - computed_size, style.TextAutosizingMultiplier()); + computed_size, style.TextAutosizingMultiplier(), style.EffectiveZoom()); font_description.SetComputedSize(computed_size); } |