Title: [284452] trunk/Source/WebCore
- Revision
- 284452
- Author
- za...@apple.com
- Date
- 2021-10-19 07:45:58 -0700 (Tue, 19 Oct 2021)
Log Message
[LFC][IFC] Rename Line::removeCollapsibleContent to removeTrimmableContent
https://bugs.webkit.org/show_bug.cgi?id=231930
Reviewed by Antti Koivisto.
"Trimming" is closer to spec language.
* layout/formattingContexts/inline/InlineLine.cpp:
(WebCore::Layout::Line::removeTrimmableContent):
(WebCore::Layout::Line::removeCollapsibleContent): Deleted.
* layout/formattingContexts/inline/InlineLine.h:
* layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::close):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (284451 => 284452)
--- trunk/Source/WebCore/ChangeLog 2021-10-19 14:27:17 UTC (rev 284451)
+++ trunk/Source/WebCore/ChangeLog 2021-10-19 14:45:58 UTC (rev 284452)
@@ -1,3 +1,19 @@
+2021-10-19 Alan Bujtas <za...@apple.com>
+
+ [LFC][IFC] Rename Line::removeCollapsibleContent to removeTrimmableContent
+ https://bugs.webkit.org/show_bug.cgi?id=231930
+
+ Reviewed by Antti Koivisto.
+
+ "Trimming" is closer to spec language.
+
+ * layout/formattingContexts/inline/InlineLine.cpp:
+ (WebCore::Layout::Line::removeTrimmableContent):
+ (WebCore::Layout::Line::removeCollapsibleContent): Deleted.
+ * layout/formattingContexts/inline/InlineLine.h:
+ * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+ (WebCore::Layout::LineBuilder::close):
+
2021-10-19 Youenn Fablet <you...@apple.com>
[ wk2 ] 2 page-cache layout-tests are flakey crashing
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp (284451 => 284452)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp 2021-10-19 14:27:17 UTC (rev 284451)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp 2021-10-19 14:45:58 UTC (rev 284452)
@@ -89,7 +89,7 @@
m_trailingSoftHyphenWidth = { };
}
-void Line::removeCollapsibleContent(InlineLayoutUnit horizontalAvailableSpace)
+void Line::removeTrimmableContent(InlineLayoutUnit horizontalAvailableSpace)
{
removeTrailingTrimmableContent();
visuallyCollapseHangingOverflow(horizontalAvailableSpace);
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.h (284451 => 284452)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.h 2021-10-19 14:27:17 UTC (rev 284451)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.h 2021-10-19 14:45:58 UTC (rev 284452)
@@ -60,7 +60,7 @@
std::optional<InlineLayoutUnit> trailingSoftHyphenWidth() const { return m_trailingSoftHyphenWidth; }
void addTrailingHyphen(InlineLayoutUnit hyphenLogicalWidth);
- void removeCollapsibleContent(InlineLayoutUnit horizontalAvailableSpace);
+ void removeTrimmableContent(InlineLayoutUnit horizontalAvailableSpace);
void applyRunExpansion(InlineLayoutUnit horizontalAvailableSpace);
struct Run {
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp (284451 => 284452)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp 2021-10-19 14:27:17 UTC (rev 284451)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp 2021-10-19 14:45:58 UTC (rev 284452)
@@ -418,7 +418,7 @@
return lineRange;
}
auto horizontalAvailableSpace = m_lineLogicalRect.width();
- m_line.removeCollapsibleContent(horizontalAvailableSpace);
+ m_line.removeTrimmableContent(horizontalAvailableSpace);
auto horizontalAlignment = root().style().textAlign();
auto runsExpandHorizontally = horizontalAlignment == TextAlignMode::Justify && !isLastLineWithInlineContent(lineRange, needsLayoutRange.end, committedContent.partialTrailingContentLength);
if (runsExpandHorizontally)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
