-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add STAT table to CanvasTest.ttf, to ensure macOS uses OS_2 sTypo ascent&descent #17474
Add STAT table to CanvasTest.ttf, to ensure macOS uses OS_2 sTypo ascent&descent #17474
Conversation
EWS run on previous version of this PR (hash dd937e9) |
dd937e9
to
7a84978
Compare
EWS run on previous version of this PR (hash 7a84978) |
7a84978
to
cf47771
Compare
EWS run on previous version of this PR (hash cf47771) |
cf47771
to
85f76cf
Compare
EWS run on previous version of this PR (hash 85f76cf) |
85f76cf
to
735d06b
Compare
EWS run on previous version of this PR (hash 735d06b) |
735d06b
to
f69f61a
Compare
EWS run on previous version of this PR (hash f69f61a) |
f69f61a
to
f3df480
Compare
EWS run on previous version of this PR (hash f3df480) |
f3df480
to
4a6c744
Compare
EWS run on current version of this PR (hash 4a6c744) |
β¦ent&descent https://bugs.webkit.org/show_bug.cgi?id=261871 rdar://115148836 Reviewed by Myles C. Maxfield. CoreText uses metrics from the font's hhea table by default. However if there is a STAT table, CT will respect the USE_TYPO_METRICS flag (already set) and used the OS/2 sTypo metrics instead, which have the ascent&descent that WPT tests expect. This fixes a lot of canvas "text" tests on macOS. And related platform-specific "-expected" files are now redundant. * LayoutTests/imported/w3c/fonts/CanvasTest-ascent256.ttf: * LayoutTests/imported/w3c/fonts/CanvasTest-descent0.ttf: * LayoutTests/imported/w3c/fonts/CanvasTest.ttf: * LayoutTests/imported/w3c/web-platform-tests/fonts/CanvasTest-ascent256.ttf: * LayoutTests/imported/w3c/web-platform-tests/fonts/CanvasTest-descent0.ttf: * LayoutTests/imported/w3c/web-platform-tests/fonts/CanvasTest.ttf: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.bottom-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.ideographic-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.middle-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.top-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.baselines-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker-expected.txt: * LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.bottom-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.middle-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.top-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.baselines-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker-expected.txt: Removed. * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.ideographic-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.baselines-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker-expected.txt: Removed. * LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.bottom-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.middle-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.draw.baseline.top-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.baselines-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker-expected.txt: Removed. * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker-expected.txt: Removed. Canonical link: https://commits.webkit.org/268275@main
4a6c744
to
50cfb6a
Compare
Committed 268275@main (50cfb6a): https://commits.webkit.org/268275@main Reviewed commits have been landed. Closing PR #17474 and removing active labels. |
50cfb6a
4a6c744