Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 9ad4496f8ff8bc3ac14950b1e0f38914e7a75fe3
https://github.com/WebKit/WebKit/commit/9ad4496f8ff8bc3ac14950b1e0f38914e7a75fe3
Author: Alan Baradlay <[email protected]>
Date: 2025-12-04 (Thu, 04 Dec 2025)
Changed paths:
M
Source/WebCore/layout/formattingContexts/inline/InlineContentConstrainer.cpp
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
M Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.cpp
M Source/WebCore/layout/formattingContexts/inline/LineLayoutResult.h
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h
M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h
M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h
M
Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.h
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
Log Message:
-----------
[cleanup] Add InlineDisplay::Line::hasInflowBox to be able to tell if line
has any inflow content (even empty like <span></span>)
https://bugs.webkit.org/show_bug.cgi?id=303510
Reviewed by Antti Koivisto.
This is in preparation for reporting content height by looking at the last line
with
any inline content as opposed to contentful lines only.
Display::Line now has the following API
hasInflowBox() -any kind of inflow box even empty content like <span><span>
(false when only out-of-flow content is present)
hasContentfulInFlowBox() -inflow content like "text' or <span style="border:
solid">
hasInlineLevelBox() -any kind of inline box including visually empty ones
hasContentfulInlineLevelBox() -inline content like <img> "text" etc
hasBlockLevelBox() -block level box <span><div></div></span>
* Source/WebCore/layout/formattingContexts/inline/InlineContentConstrainer.cpp:
(WebCore::Layout::InlineContentConstrainer::initialize):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::lineLayout):
(WebCore::Layout::InlineFormattingContext::createDisplayContentForInlineContent):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp:
(WebCore::Layout::InlineFormattingUtils::logicalTopForNextLine const):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::build):
* Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.cpp:
(WebCore::Layout::IntrinsicWidthHandler::computedIntrinsicWidthForConstraint):
* Source/WebCore/layout/formattingContexts/inline/LineLayoutResult.h:
(WebCore::Layout::LineLayoutResult::hasContentfulInFlowContent const):
(WebCore::Layout::LineLayoutResult::hasContentfulInlineContent const):
(WebCore::Layout::LineLayoutResult::isBlockContent const):
(WebCore::Layout::LineLayoutResult::hasInlineContent const): Deleted.
(WebCore::Layout::LineLayoutResult::hasBlockContent const): Deleted.
(WebCore::Layout::LineLayoutResult::hasInflowContent const): Deleted.
*
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::processNonBidiContent):
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h:
(WebCore::InlineDisplay::Line::hasInflowBox const):
(WebCore::InlineDisplay::Line::hasContentfulInFlowBox const):
(WebCore::InlineDisplay::Line::hasInlineLevelBox const):
(WebCore::InlineDisplay::Line::hasContentfulInlineLevelBox const):
(WebCore::InlineDisplay::Line::hasBlockLevelBox const):
(WebCore::InlineDisplay::Line::Line):
(WebCore::InlineDisplay::Line::isInFlowContentful const): Deleted.
(WebCore::InlineDisplay::Line::hasInlineContent const): Deleted.
(WebCore::InlineDisplay::Line::hasBlockContent const): Deleted.
*
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:
(WebCore::Layout::InlineDisplayLineBuilder::build const):
(WebCore::Layout::InlineDisplayLineBuilder::hasTrailingLineWithBlockContent):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h:
(WebCore::InlineIterator::LineBox::hasBlockContent const):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h:
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::hasBlockLevelBox const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::hasBlockContent const):
Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h:
(WebCore::InlineIterator::LineBoxIteratorModernPath::hasBlockLevelBox const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::hasBlockContent const):
Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.cpp:
(WebCore::LayoutIntegration::InlineContent::hasContentfulInFlowBox const):
(WebCore::LayoutIntegration::InlineContent::blockLevelBoxForLine const):
(WebCore::LayoutIntegration::InlineContent::isInlineBoxWrapperForBlockLevelBox
const):
(WebCore::LayoutIntegration::InlineContent::isInFlowContentful const): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::lastLineWithInflowContent):
(WebCore::LayoutIntegration::LineLayout::hasEllipsisInBlockDirectionOnLastFormattedLine
const):
(WebCore::LayoutIntegration::LineLayout::isSelfCollapsingContent const):
(WebCore::LayoutIntegration::LineLayout::lineCount const):
(WebCore::LayoutIntegration::LineLayout::firstLineBaseline const):
(WebCore::LayoutIntegration::LineLayout::lastLineBaseline const):
(WebCore::LayoutIntegration::LineLayout::firstRootInlineBox const):
(WebCore::LayoutIntegration::LineLayout::firstLineBox const):
(WebCore::LayoutIntegration::LineLayout::lastLineBox const):
(WebCore::LayoutIntegration::LineLayout::enclosingBorderBoxRectFor const):
Canonical link: https://commits.webkit.org/303924@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
