[Cocoa] font-variation-settings:opsz is not applied when text-rendering:optimizeLegibility is set #12301

litherum · 2023-04-03T02:07:27Z

`8bbfbb1`

[Cocoa] font-variation-settings:opsz is not applied when text-rendering:optimizeLegibility is set
https://bugs.webkit.org/show_bug.cgi?id=254897
rdar://106814619

Reviewed by Simon Fraser.

text-rendering:optimizeLegibility turns on kCTFontOpticalSizeAttribute:”auto” in Core Text,
and font-variation-settings:opsz turns on kCTFontVariationAttribute:opsz in Core Text. When
both are applied, font-variation-settings is supposed to win. However, in Core Text,
kCTFontOpticalSizeAttribute wins.

The solution for this is to set kCTFontOpticalSizeAttribute to a specific size, given by
font-variation-settings:opsz. This should only happen when OpticalSizingTypes::Everything
is enabled, so this patch adds an optional<float> to that struct. All this is guarded by
a USE() so we can remove it if/when Core text changes to match the CSS behavior.

Test: fast/text/variations/optical-sizing-optimizeLegibility.html

* Source/WTF/wtf/PlatformUse.h:
* Source/WebCore/platform/graphics/FontTaggedSettings.h:
* Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.cpp:
(WebCore::UnrealizedCoreTextFont::addAttributesForOpticalSizing):
(WebCore::UnrealizedCoreTextFont::modifyFromContext):
* Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.h:

Canonical link: https://commits.webkit.org/262831@main

bcd51a2

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

webkit-early-warning-system · 2023-04-03T02:10:13Z

EWS run on previous version of this PR (hash 9da23d5)

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

litherum · 2023-04-03T02:16:18Z

This depends on #12300

litherum · 2023-04-03T02:17:15Z

Oh, this needs a test.

webkit-early-warning-system · 2023-04-03T02:18:24Z

EWS run on previous version of this PR (hash 4805c60)

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

webkit-early-warning-system · 2023-04-03T02:58:01Z

EWS run on previous version of this PR (hash 08e4eb3)

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

Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.h

Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.cpp

webkit-early-warning-system · 2023-04-08T04:01:23Z

EWS run on previous version of this PR (hash 267419f)

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

webkit-early-warning-system · 2023-04-08T04:05:56Z

EWS run on previous version of this PR (hash 2f726a9)

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

Source/WTF/wtf/PlatformUse.h

smfr · 2023-04-11T04:28:42Z

Source/WTF/wtf/PlatformUse.h

+    || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 180000) \
+    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 180000) \
+    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 110000)
+#define USE_CORE_TEXT_OPTICAL_SIZING_WORKAROUND 1


Workaround for what? A radar link in a comment would be good.

webkit-early-warning-system · 2023-04-11T17:04:58Z

EWS run on current version of this PR (hash bcd51a2)

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

…ng:optimizeLegibility is set https://bugs.webkit.org/show_bug.cgi?id=254897 rdar://106814619 Reviewed by Simon Fraser. text-rendering:optimizeLegibility turns on kCTFontOpticalSizeAttribute:”auto” in Core Text, and font-variation-settings:opsz turns on kCTFontVariationAttribute:opsz in Core Text. When both are applied, font-variation-settings is supposed to win. However, in Core Text, kCTFontOpticalSizeAttribute wins. The solution for this is to set kCTFontOpticalSizeAttribute to a specific size, given by font-variation-settings:opsz. This should only happen when OpticalSizingTypes::Everything is enabled, so this patch adds an optional<float> to that struct. All this is guarded by a USE() so we can remove it if/when Core text changes to match the CSS behavior. Test: fast/text/variations/optical-sizing-optimizeLegibility.html * Source/WTF/wtf/PlatformUse.h: * Source/WebCore/platform/graphics/FontTaggedSettings.h: * Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.cpp: (WebCore::UnrealizedCoreTextFont::addAttributesForOpticalSizing): (WebCore::UnrealizedCoreTextFont::modifyFromContext): * Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.h: Canonical link: https://commits.webkit.org/262831@main

webkit-commit-queue · 2023-04-11T18:20:38Z

Committed 262831@main (8bbfbb1): https://commits.webkit.org/262831@main

Reviewed commits have been landed. Closing PR #12301 and removing active labels.

litherum self-assigned this Apr 3, 2023

litherum added the Text For bugs in text layout and rendering, including international text support. label Apr 3, 2023

litherum force-pushed the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch from 9da23d5 to 4805c60 Compare April 3, 2023 02:15

litherum marked this pull request as ready for review April 3, 2023 02:16

litherum requested review from smfr, heycam and alanbaradlay April 3, 2023 02:17

litherum marked this pull request as draft April 3, 2023 02:17

litherum force-pushed the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch from 4805c60 to 08e4eb3 Compare April 3, 2023 02:57

litherum marked this pull request as ready for review April 3, 2023 02:58

mdubet reviewed Apr 3, 2023

View reviewed changes

Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.h Outdated Show resolved Hide resolved

Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.cpp Outdated Show resolved Hide resolved

litherum force-pushed the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch from 08e4eb3 to 267419f Compare April 8, 2023 03:58

litherum force-pushed the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch from 267419f to 2f726a9 Compare April 8, 2023 04:05

litherum requested a review from mdubet April 8, 2023 04:09

rreno reviewed Apr 8, 2023

View reviewed changes

Source/WTF/wtf/PlatformUse.h Show resolved Hide resolved

litherum requested a review from rreno April 11, 2023 04:21

smfr approved these changes Apr 11, 2023

View reviewed changes

litherum force-pushed the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch from 2f726a9 to bcd51a2 Compare April 11, 2023 17:01

litherum added the merge-queue Applied to send a pull request to merge-queue label Apr 11, 2023

webkit-commit-queue force-pushed the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch from bcd51a2 to 8bbfbb1 Compare April 11, 2023 18:20

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Apr 11, 2023

webkit-commit-queue merged commit 8bbfbb1 into WebKit:main Apr 11, 2023

litherum deleted the eng/Cocoa-font-variation-settingsopsz-is-not-applied-when-text-renderingoptimizeLegibility-is-set branch April 11, 2023 19:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Cocoa] font-variation-settings:opsz is not applied when text-rendering:optimizeLegibility is set #12301

[Cocoa] font-variation-settings:opsz is not applied when text-rendering:optimizeLegibility is set #12301

litherum commented Apr 3, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Apr 3, 2023 •

edited

litherum commented Apr 3, 2023

litherum commented Apr 3, 2023

webkit-early-warning-system commented Apr 3, 2023 •

edited

webkit-early-warning-system commented Apr 3, 2023 •

edited

webkit-early-warning-system commented Apr 8, 2023 •

edited

webkit-early-warning-system commented Apr 8, 2023 •

edited

smfr Apr 11, 2023

webkit-early-warning-system commented Apr 11, 2023 •

edited

webkit-commit-queue commented Apr 11, 2023

[Cocoa] font-variation-settings:opsz is not applied when text-rendering:optimizeLegibility is set #12301

[Cocoa] font-variation-settings:opsz is not applied when text-rendering:optimizeLegibility is set #12301

Conversation

litherum commented Apr 3, 2023 • edited by webkit-early-warning-system

8bbfbb1

webkit-early-warning-system commented Apr 3, 2023 • edited

litherum commented Apr 3, 2023

litherum commented Apr 3, 2023

webkit-early-warning-system commented Apr 3, 2023 • edited

webkit-early-warning-system commented Apr 3, 2023 • edited

webkit-early-warning-system commented Apr 8, 2023 • edited

webkit-early-warning-system commented Apr 8, 2023 • edited

smfr Apr 11, 2023

Choose a reason for hiding this comment

webkit-early-warning-system commented Apr 11, 2023 • edited

webkit-commit-queue commented Apr 11, 2023

litherum commented Apr 3, 2023 •

edited by webkit-early-warning-system

`8bbfbb1`

webkit-early-warning-system commented Apr 3, 2023 •

edited

webkit-early-warning-system commented Apr 3, 2023 •

edited

webkit-early-warning-system commented Apr 3, 2023 •

edited

webkit-early-warning-system commented Apr 8, 2023 •

edited

webkit-early-warning-system commented Apr 8, 2023 •

edited

webkit-early-warning-system commented Apr 11, 2023 •

edited