Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 9b0f01ca9e14c8cf7b5485dadeaaeed687e2a851
https://github.com/WebKit/WebKit/commit/9b0f01ca9e14c8cf7b5485dadeaaeed687e2a851
Author: Sam Weinig <[email protected]>
Date: 2026-09-08 (Tue, 08 Sep 2026)
Changed paths:
M Source/WebCore/css/CSSProperties.json
M Source/WebCore/html/HTMLInputElement.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineLevelBoxInlines.h
M Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineQuirks.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
M Source/WebCore/page/PrintContext.cpp
M Source/WebCore/rendering/CaretRectComputation.cpp
M Source/WebCore/rendering/RenderBlockFlow.cpp
M Source/WebCore/rendering/RenderBox.cpp
M Source/WebCore/rendering/RenderInline.cpp
M Source/WebCore/rendering/RenderLayoutState.cpp
M Source/WebCore/rendering/RenderListOutsideMarker.cpp
M Source/WebCore/rendering/RenderTextControl.cpp
M Source/WebCore/rendering/RenderTheme.cpp
M Source/WebCore/rendering/TextAutoSizing.cpp
M Source/WebCore/rendering/adwaita/RenderThemeAdwaita.cpp
M Source/WebCore/rendering/cocoa/RenderThemeCocoa.mm
M Source/WebCore/rendering/ios/RenderThemeIOS.mm
M Source/WebCore/rendering/line/LineInlineHeaders.h
M Source/WebCore/rendering/mac/RenderThemeMac.mm
M Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp
M Source/WebCore/style/StyleAdjuster.cpp
M Source/WebCore/style/StyleBuilderCustom.h
M Source/WebCore/style/StyleDifference.cpp
M Source/WebCore/style/StyleExtractorCustom.h
M Source/WebCore/style/StyleTreeResolver.cpp
M Source/WebCore/style/computed/StyleComputedStyle+InitialInlines.h
M Source/WebCore/style/computed/StyleComputedStyle.cpp
M Source/WebCore/style/computed/StyleComputedStyle.h
M Source/WebCore/style/computed/StyleComputedStyleBase.cpp
M Source/WebCore/style/computed/StyleComputedStyleBase.h
M Source/WebCore/style/computed/data/StyleInheritedData.cpp
M Source/WebCore/style/computed/data/StyleInheritedData.h
M Source/WebKit/WebProcess/WebPage/Cocoa/PositionInformationForWebPage.mm
M Source/WebKitLegacy/mac/DOM/DOMUIKitExtensions.mm
M Source/WebKitLegacy/mac/WebView/WebFrame.mm
Log Message:
-----------
Replace references to ComputedStyle's "lineHeight" with
"textAutosizingAdjustedLineHeight" and "computedLineHeight" with
"usedLineHeight"
https://bugs.webkit.org/show_bug.cgi?id=323631
Reviewed by Darin Adler.
Part 1 of https://bugs.webkit.org/show_bug.cgi?id=323630
Style::ComputedStyle currently has three different line height accessors:
- lineHeight()
- specifiedLineHeight()
- computedLineHeight()
None of these are clear and none of the prefixes align with their counterpart
CSS concept. Rather, what they actually represent is:
- lineHeight() -> text autosizing adjusted computed style
- specifiedLineHeight() -> computed style
- computedLineHeight() -> zoom, percentage and keyword evaluated transform
of
the "text autosizing adjusted computed style".
As an initial step to fixing these names, we make the following renames:
- lineHeight() -> textAutosizingAdjustedLineHeight()
- computedLineHeight() -> usedLineHeight()
Whether we need to keep textAutosizingAdjustedLineHeight() long term is unclear.
It depends on whether the caching the transformation is necessary to maintain
performance, so that is something to handle at another time.
specifiedLineHeight() will be handled in a part 2.
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/html/HTMLInputElement.cpp:
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp:
* Source/WebCore/layout/formattingContexts/inline/InlineLevelBoxInlines.h:
* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:
* Source/WebCore/layout/formattingContexts/inline/InlineQuirks.cpp:
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
* Source/WebCore/page/PrintContext.cpp:
* Source/WebCore/rendering/CaretRectComputation.cpp:
* Source/WebCore/rendering/RenderBlockFlow.cpp:
* Source/WebCore/rendering/RenderBox.cpp:
* Source/WebCore/rendering/RenderInline.cpp:
* Source/WebCore/rendering/RenderLayoutState.cpp:
* Source/WebCore/rendering/RenderListOutsideMarker.cpp:
* Source/WebCore/rendering/RenderTextControl.cpp:
* Source/WebCore/rendering/RenderTheme.cpp:
* Source/WebCore/rendering/TextAutoSizing.cpp:
* Source/WebCore/rendering/adwaita/RenderThemeAdwaita.cpp:
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.mm:
* Source/WebCore/rendering/ios/RenderThemeIOS.mm:
* Source/WebCore/rendering/line/LineInlineHeaders.h:
* Source/WebCore/rendering/mac/RenderThemeMac.mm:
* Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp:
* Source/WebCore/style/StyleAdjuster.cpp:
* Source/WebCore/style/StyleBuilderCustom.h:
* Source/WebCore/style/StyleDifference.cpp:
* Source/WebCore/style/StyleExtractorCustom.h:
* Source/WebCore/style/StyleTreeResolver.cpp:
* Source/WebCore/style/computed/StyleComputedStyle+InitialInlines.h:
* Source/WebCore/style/computed/StyleComputedStyle.cpp:
* Source/WebCore/style/computed/StyleComputedStyle.h:
* Source/WebCore/style/computed/StyleComputedStyleBase.cpp:
* Source/WebCore/style/computed/StyleComputedStyleBase.h:
* Source/WebCore/style/computed/data/StyleInheritedData.cpp:
* Source/WebCore/style/computed/data/StyleInheritedData.h:
* Source/WebKit/WebProcess/WebPage/Cocoa/PositionInformationForWebPage.mm:
* Source/WebKitLegacy/mac/DOM/DOMUIKitExtensions.mm:
* Source/WebKitLegacy/mac/WebView/WebFrame.mm:
Canonical link: https://commits.webkit.org/320670@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
