Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 44590c1896d6fbf5d069f7e6f693614593a8ea99
https://github.com/WebKit/WebKit/commit/44590c1896d6fbf5d069f7e6f693614593a8ea99
Author: Alan Baradlay <[email protected]>
Date: 2025-11-21 (Fri, 21 Nov 2025)
Changed paths:
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineLayoutState.h
M
Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp
Log Message:
-----------
[IFC] Keep track of the number of lines with content.
https://bugs.webkit.org/show_bug.cgi?id=302905
Reviewed by Antti Koivisto.
1. m_lineCount holds the number of lines with either inline or block content
within the current formatting context.
2. m_lineCountWithInlineContentIncludingNestedBlocks holds the number of lines
with _inline_
content (not empty lines though e.g. <span></span>) including lines from
nested blocks.
This is in preparation for implementing text-box-trim for blocks-in-inline.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layout):
(WebCore::Layout::InlineFormattingContext::lineLayout):
(WebCore::Layout::InlineFormattingContext::createDisplayContentForInlineContent):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp:
(WebCore::Layout::InlineFormattingUtils::shouldDiscardRemainingContentInBlockDirection
const):
* Source/WebCore/layout/formattingContexts/inline/InlineLayoutState.h:
(WebCore::Layout::InlineLayoutState::setLineCount):
(WebCore::Layout::InlineLayoutState::lineCount const):
(WebCore::Layout::InlineLayoutState::setLineCountWithInlineContentIncludingNestedBlocks):
(WebCore::Layout::InlineLayoutState::lineCountWithInlineContentIncludingNestedBlocks
const):
(WebCore::Layout::InlineLayoutState::lineCountForBlockDirectionClamp const):
Deleted.
(WebCore::Layout::InlineLayoutState::setLineCountForBlockDirectionClamp):
Deleted.
*
Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp:
(WebCore::LayoutIntegration::layoutWithFormattingContextForBlockInInline):
Canonical link: https://commits.webkit.org/303394@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
