Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: a055bb114d45c7e5146b1d6858972fa24e713f71
https://github.com/WebKit/WebKit/commit/a055bb114d45c7e5146b1d6858972fa24e713f71
Author: Alan Baradlay <[email protected]>
Date: 2023-04-13 (Thu, 13 Apr 2023)
Changed paths:
M Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h
M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h
M
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp
M
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.h
Log Message:
-----------
[IFC] InlineLevelBox::LayoutBounds is a glorified AscentAndDescent
https://bugs.webkit.org/show_bug.cgi?id=255387
Reviewed by Antti Koivisto.
1. Move AscentAndDescent from InlineLineBoxBuilder.cpp under InlineLevelBox
2. Turn both InlineLevelBox::LayoutBounds and InlineLevelBox's
m_ascent/m_descent into a AscentAndDescent
* Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h:
(WebCore::Layout::InlineLevelBox::AscentAndDescent::height const):
(WebCore::Layout::InlineLevelBox::AscentAndDescent::operator== const):
(WebCore::Layout::InlineLevelBox::ascent const):
(WebCore::Layout::InlineLevelBox::descent const):
(WebCore::Layout::InlineLevelBox::LayoutBounds::ascent const):
(WebCore::Layout::InlineLevelBox::LayoutBounds::descent const):
(WebCore::Layout::InlineLevelBox::LayoutBounds::height const):
(WebCore::Layout::InlineLevelBox::LayoutBounds::operator== const):
(WebCore::Layout::InlineLevelBox::setAscentAndDescent):
(WebCore::Layout::InlineLevelBox::setLayoutBounds):
(WebCore::Layout::InlineLevelBox::LayoutBounds::LayoutBounds):
(WebCore::Layout::InlineLevelBox::AscentAndDescent::round):
(WebCore::Layout::InlineLevelBox::setAscent): Deleted.
(WebCore::Layout::InlineLevelBox::setDescent): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::primaryFontMetricsForInlineBox):
(WebCore::Layout::ascentAndDescentWithTextEdgeForInlineBox):
(WebCore::Layout::LineBoxBuilder::enclosingAscentDescentWithFallbackFonts
const):
(WebCore::Layout::LineBoxBuilder::setLayoutBoundsForInlineBox const):
(WebCore::Layout::LineBoxBuilder::setVerticalPropertiesForInlineLevelBox const):
(WebCore::Layout::LineBoxBuilder::constructInlineLevelBoxes):
(WebCore::Layout::LineBoxBuilder::adjustInlineBoxHeightsForLineBoxContainIfApplicable):
(WebCore::Layout::LineBoxBuilder::adjustIdeographicBaselineIfApplicable):
(WebCore::Layout::LineBoxBuilder::computeLineBoxGeometry const):
(): Deleted.
(WebCore::Layout::AscentAndDescent::height const): Deleted.
(WebCore::Layout::AscentAndDescent::round const): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h:
*
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp:
(WebCore::Layout::LineBoxVerticalAligner::computeLogicalHeightAndAlign const):
(WebCore::Layout::LineBoxVerticalAligner::simplifiedVerticalAlignment const):
(WebCore::Layout::LineBoxVerticalAligner::computeLineBoxLogicalHeight const):
(WebCore::Layout::LineBoxVerticalAligner::computeRootInlineBoxVerticalPosition
const):
(WebCore::Layout::LineBoxVerticalAligner::layoutBoundsForInlineBoxSubtree
const):
(WebCore::Layout::LineBoxVerticalAligner::alignInlineLevelBoxes const):
(WebCore::Layout::LineBoxVerticalAligner::adjustForAnnotationIfNeeded const):
Canonical link: https://commits.webkit.org/262942@main
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
