Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 6858935de9b1bad484c200582098440b672ffb90
https://github.com/WebKit/WebKit/commit/6858935de9b1bad484c200582098440b672ffb90
Author: Gerald Squelart <[email protected]>
Date: 2026-02-02 (Mon, 02 Feb 2026)
Changed paths:
M Source/WebCore/platform/graphics/FontCascade.cpp
M Source/WebCore/platform/graphics/FontCascade.h
M Source/WebCore/rendering/RenderText.cpp
M Source/WebCore/rendering/RenderText.h
M Source/WebKit/WebProcess/WebProcess.cpp
M Source/WebKitLegacy/mac/WebView/WebView.mm
Log Message:
-----------
Refactor Auto out of FontCascade::CodePath
https://bugs.webkit.org/show_bug.cgi?id=306744
rdar://169412290
Reviewed by Dan Glastonbury.
FontCascade::CodePath::Auto is only really needed to signify "don't
force a specific code path" when debugging, otherwise most places expect
a non-Auto value.
So this removes Auto, and where needed embeds CodePath in a Markable<>,
where std::nullopt is the equivalent of the old Auto.
RenderText::m_fontCodePath can be an enum (they are allowed in C++
struct bit fields), so it should just directly use FontCascade::CodePath.
* Source/WebCore/platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::setForcedCodePath):
(WebCore::FontCascade::forcedCodePath):
(WebCore::FontCascade::codePath const):
(WebCore::FontCascade::setCodePath): Deleted.
(WebCore::FontCascade::codePath): Deleted.
* Source/WebCore/platform/graphics/FontCascade.h:
* Source/WebCore/rendering/RenderText.cpp:
(WebCore::computeFontCodePath):
(WebCore::m_fontCodePath):
(WebCore::RenderText::setRenderedText):
(WebCore::m_containsOnlyASCII): Deleted.
(WebCore::RenderText::computeFontCodePath): Deleted.
* Source/WebCore/rendering/RenderText.h:
(WebCore::RenderText::fontCodePath const):
* Source/WebKit/WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setAlwaysUsesComplexTextCodePath):
* Source/WebKitLegacy/mac/WebView/WebView.mm:
(+[WebView _setAlwaysUsesComplexTextCodePath:]):
Canonical link: https://commits.webkit.org/306683@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
