WebKit icon indicating copy to clipboard operation
WebKit copied to clipboard

Published 20 hours ago • verified publisher icon WebKit

Account for zoom when computing SVG font size

Open Ahmad-S792 opened this issue 2 years ago • 17 comments 

Account for zoom when computing SVG font size

https://bugs.webkit.org/show_bug.cgi?id=118818

Reviewed by NOBODY (OOPS!).

Merge - https://chromium.googlesource.com/chromium/blink/+/5624c6e475af92d541edc8a3394602e320d00323 & https://src.chromium.org/viewvc/blink?view=revision&revision=180995

Previously, text that was zoomed appeared larger than geometry under the same zoom value. This was caused by two bugs:
1) When setting the computed font size, we incorrectly referenced the computedTextSize instead of the specified size.
2) Text with GeometricPrecision did not set a computed size but instead relied on the text size being correct.

Further, it also fixes an issue about optimization in RenderSVGInlineText::computeNewScaledFontForStyle would skip updating the font size on lowdpi devices while zooming. The computed font size calculation depends on zoom and the font scaling factor depends on the device's scaling factor. Previously, we would skip updating the font when the scaling factor was 1 which would fail to account for zoom. This patch updates the optimization to only be used when both the scaling factor and zoom are 1.

This change addresses both of these issues and adds a test to prove correctness.

* Source/WebCore/rendering/svg/RenderSVGInlineText.cpp:
(RenderSVGInlineText::computedNewScaledFontForStyle) - Updated Scaling factor to be accounted into two buckets: 1) GeometricPrecision 2) computedTextSize being referred 3) Use DoNotUseSmartMinimumForFontSize 4) Also fix low DPI issue
* LayoutTests/svg/zoom/text/zoom-text-geometry.html: Added Test Case
* LayoutTests/svg/zoom/text/zoom-text-geometry-expected.html: Added Test Case Expectations
* LayoutTests/svg/zoom/text/lowdpi-zoom-text.html: Added Test Case
* LayoutTests/svg/texst/lowdpi-zoom-text-expected.txt: Added Test Case Expectations

https://github.com/WebKit/WebKit/commit/2dbdf5c9a40dde630ab89f1654f351af86bfdbc0

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ❌ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-wk1
✅ 🛠 tv-sim ❌ 🧪 mac-wk2
✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

Ahmad-S792 avatar Sep 04 '22 21:09 Ahmad-S792

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/7a165c874ad2a497c764af7a5b17d2405b351c74)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 04 '22 21:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/971ee85f81453cf05b982cd10eac6b7a7b00ce6d)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 06 '22 05:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/2cbd1393ba1f59cfdb686ecee2cb1e8c2a906c1b)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ⏳ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv   ~~🧪 mac-wk1~~
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 08 '22 21:09 webkit-early-warning-system

@smfr & @nikolaszimmermann - Can you guide or suggest on how to fix this 'ios-wk2' failure (svg/text/font-small-enlarged-minimum-larger.svg)?

Ahmad-S792 avatar Sep 09 '22 08:09 Ahmad-S792

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/dd62d1720c2c37b28b9fb705fc59a6aa1ae38c95)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ❌ 🛠 ios ❌ 🛠 mac ❌ 🛠 wpe ⏳ 🛠 🧪 win
✅ 🧪 bindings ❌ 🛠 ios-sim ❌ 🛠 mac-debug ❌ 🛠 gtk ❌ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ❌ 🛠 mac-AS-debug ❌ 🧪 gtk-wk2
❌ 🧪 api-ios ❌ 🧪 api-mac ❌ 🧪 api-gtk
❌ 🛠 tv ❌ 🧪 mac-wk1
❌ 🛠 tv-sim ❌ 🧪 mac-wk2
❌ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
❌ 🛠 watch-sim ❌ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 10 '22 19:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/e71775ab69f38b0464ee2daa6a4fc04c5e9b5d36)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 10 '22 20:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/d8b31c624e26832075d8d543b4213aece320c24e)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ⏳ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ⏳ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl   ~~🧪 ios-wk2~~ ⏳ 🛠 mac-AS-debug   ~~🧪 gtk-wk2~~
✅ 🧪 api-ios ⏳ 🧪 api-mac   ~~🧪 api-gtk~~
✅ 🛠 tv ⏳ 🧪 mac-wk1
✅ 🛠 tv-sim ⏳ 🧪 mac-wk2
✅ 🛠 watch ⏳ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ⏳ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 16 '22 07:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/3a63c84e98b1a95a2d66560068509ecd85b4e3a2)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ⏳ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl   ~~🧪 ios-wk2~~ ⏳ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv   ~~🧪 mac-wk1~~
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 watch ⏳ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 16 '22 10:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/ee073cabfa625e3f8f311373732dab0b33a08993)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ❌ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ❌ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ❌ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-wk1
✅ 🛠 tv-sim ❌ 🧪 mac-wk2
✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 16 '22 14:09 webkit-early-warning-system

Sorry for not responding at all - I'm pretty busy these days...

nikolaszimmermann avatar Sep 16 '22 19:09 nikolaszimmermann

Thanks for tackling this -- not ready though, the LayoutTests changes seem fishy.

Replied above and would appreciate your guidance because I am able to pass all changes by adding 'font-size: 80' but only fails in iOS-wk2 and have asked for input from Simon and he referred that it might be iOS device scaling factor and I should look into hidpi test cases.

Ahmad-S792 avatar Sep 17 '22 07:09 Ahmad-S792

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/e6ebd1abd52232862363f878b42e6eddadff7595)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 17 '22 12:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/f958ea21a216a710617d3a88b66474548e963cbd)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ❌ 🛠 ios ⏳ 🛠 mac   ~~🛠 wpe~~   ~~🛠 🧪 win~~
✅ 🧪 bindings ❌ 🛠 ios-sim ⏳ 🛠 mac-debug   ~~🛠 gtk~~   ~~🛠 wincairo~~
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ⏳ 🛠 mac-AS-debug   ~~🧪 gtk-wk2~~
❌ 🧪 api-ios ⏳ 🧪 api-mac   ~~🧪 api-gtk~~
❌ 🛠 tv ⏳ 🧪 mac-wk1 ⏳ 🛠 jsc-armv7
❌ 🛠 tv-sim ⏳ 🧪 mac-wk2 ⏳ 🧪 jsc-armv7-tests
❌ 🛠 watch ⏳ 🧪 mac-AS-debug-wk2
❌ 🛠 watch-sim ⏳ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 19 '22 07:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/ee3acf94ee495090edf8ed1f4d23ef17f0a9495a)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ❌ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ❌ 🧪 gtk-wk2
✅ 🧪 api-ios   ~~🧪 api-mac~~ ✅ 🧪 api-gtk
✅ 🛠 tv   ~~🧪 mac-wk1~~
✅ 🛠 tv-sim ❌ 🧪 mac-wk2
✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 19 '22 08:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/6a007a4e2f27e7aabf261a4c9fd9f26d9a9a1781)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ❌ 🧪 mac-wk2
✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 19 '22 12:09 webkit-early-warning-system

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/2dbdf5c9a40dde630ab89f1654f351af86bfdbc0)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ❌ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-wk1
✅ 🛠 tv-sim ❌ 🧪 mac-wk2
✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 21 '22 19:09 webkit-early-warning-system

That looks good - let's wait for EWS results. If ok, I'll r+ it. Thanks @Ahmad-S792 for your patience.

No worries - I should appreciate you to deal with noob like me. :-)

I am just learning day by day and have day job so some time response take some time. :-)

Ahmad-S792 avatar Sep 21 '22 19:09 Ahmad-S792

EWS run on current version of this PR (hash https://github.com/WebKit/WebKit/commit/488e2ebfd562800b5237959a981be11375ca5167)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ⏳ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ❌ 🛠 🧪 win
✅ 🧪 bindings ⏳ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk 💥 🛠 wincairo
✅ 🧪 webkitperl ⏳ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
⏳ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-wk1
✅ 🛠 tv-sim ❌ 🧪 mac-wk2
✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

webkit-early-warning-system avatar Sep 29 '22 23:09 webkit-early-warning-system

As discussed with @nikolaszimmermann over Slack, there is another change, which we require prior to landing this. So I will work on it and then have similar to this another PR to land this in future hoping that EWS does not reflect same failures.

Ahmad-S792 avatar Oct 17 '22 08:10 Ahmad-S792