Title: [268821] trunk/Source/WebCore
- Revision
- 268821
- Author
- [email protected]
- Date
- 2020-10-21 13:40:40 -0700 (Wed, 21 Oct 2020)
Log Message
[LFC][IFC] Line may be able to fit some more content when the current candidate is trimmable
https://bugs.webkit.org/show_bug.cgi?id=218044
Reviewed by Antti Koivisto.
This patch addresses the cases when the candidate content is partially/fully trimmable and
after putting the content on the line, there's still enough room to accommodate some more content.
* layout/inlineformatting/InlineContentBreaker.cpp:
(WebCore::Layout::InlineContentBreaker::processOverflowingContent const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (268820 => 268821)
--- trunk/Source/WebCore/ChangeLog 2020-10-21 20:27:52 UTC (rev 268820)
+++ trunk/Source/WebCore/ChangeLog 2020-10-21 20:40:40 UTC (rev 268821)
@@ -1,3 +1,16 @@
+2020-10-21 Zalan Bujtas <[email protected]>
+
+ [LFC][IFC] Line may be able to fit some more content when the current candidate is trimmable
+ https://bugs.webkit.org/show_bug.cgi?id=218044
+
+ Reviewed by Antti Koivisto.
+
+ This patch addresses the cases when the candidate content is partially/fully trimmable and
+ after putting the content on the line, there's still enough room to accommodate some more content.
+
+ * layout/inlineformatting/InlineContentBreaker.cpp:
+ (WebCore::Layout::InlineContentBreaker::processOverflowingContent const):
+
2020-10-21 Chris Dumez <[email protected]>
Add addOutput() / removeOutput() utility functions to AudioSummingJunction
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp (268820 => 268821)
--- trunk/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp 2020-10-21 20:27:52 UTC (rev 268820)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp 2020-10-21 20:40:40 UTC (rev 268821)
@@ -195,14 +195,13 @@
ASSERT(continuousContent.logicalWidth() > lineStatus.availableWidth);
if (continuousContent.hasTrailingCollapsibleContent()) {
ASSERT(isTextContent(continuousContent));
- auto IsEndOfLine = isContentWrappingAllowed(continuousContent) ? IsEndOfLine::Yes : IsEndOfLine::No;
// First check if the content fits without the trailing collapsible part.
if (continuousContent.nonCollapsibleLogicalWidth() <= lineStatus.availableWidth)
- return { Result::Action::Keep, IsEndOfLine };
+ return { Result::Action::Keep, IsEndOfLine::No };
// Now check if we can trim the line too.
if (lineStatus.hasFullyCollapsibleTrailingRun && continuousContent.isFullyCollapsible()) {
// If this new content is fully collapsible, it should surely fit.
- return { Result::Action::Keep, IsEndOfLine };
+ return { Result::Action::Keep, IsEndOfLine::No };
}
} else if (lineStatus.collapsibleWidth && isNonContentRunsOnly(continuousContent)) {
// Let's see if the non-content runs fit when the line has trailing collapsible content.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
