Title: [267622] trunk
- Revision
- 267622
- Author
- za...@apple.com
- Date
- 2020-09-26 07:14:13 -0700 (Sat, 26 Sep 2020)
Log Message
[LFC][IFC] Line content logical width expands with run expansions (text-align: justify)
https://bugs.webkit.org/show_bug.cgi?id=217011
Reviewed by Antti Koivisto.
Source/WebCore:
Test: fast/layoutformattingcontext/run-expansion-extends-line-content-width.html
* layout/inlineformatting/InlineLine.cpp:
(WebCore::Layout::Line::applyRunExpansion):
LayoutTests:
* fast/layoutformattingcontext/run-expansion-extends-line-content-width-expected.html: Added.
* fast/layoutformattingcontext/run-expansion-extends-line-content-width.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (267621 => 267622)
--- trunk/LayoutTests/ChangeLog 2020-09-26 13:52:34 UTC (rev 267621)
+++ trunk/LayoutTests/ChangeLog 2020-09-26 14:14:13 UTC (rev 267622)
@@ -1,3 +1,13 @@
+2020-09-26 Zalan Bujtas <za...@apple.com>
+
+ [LFC][IFC] Line content logical width expands with run expansions (text-align: justify)
+ https://bugs.webkit.org/show_bug.cgi?id=217011
+
+ Reviewed by Antti Koivisto.
+
+ * fast/layoutformattingcontext/run-expansion-extends-line-content-width-expected.html: Added.
+ * fast/layoutformattingcontext/run-expansion-extends-line-content-width.html: Added.
+
2020-09-25 Zalan Bujtas <za...@apple.com>
[LFC][IFC] Incorrect breaking position when inline box content fits the line but the inline content itself does not.
Added: trunk/LayoutTests/fast/layoutformattingcontext/run-expansion-extends-line-content-width-expected.html (0 => 267622)
--- trunk/LayoutTests/fast/layoutformattingcontext/run-expansion-extends-line-content-width-expected.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/run-expansion-extends-line-content-width-expected.html 2020-09-26 14:14:13 UTC (rev 267622)
@@ -0,0 +1,9 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+div {
+ background-color: green;
+ width: 200px;
+ height: 80px;
+}
+</style>
+<div></div>
\ No newline at end of file
Added: trunk/LayoutTests/fast/layoutformattingcontext/run-expansion-extends-line-content-width.html (0 => 267622)
--- trunk/LayoutTests/fast/layoutformattingcontext/run-expansion-extends-line-content-width.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/run-expansion-extends-line-content-width.html 2020-09-26 14:14:13 UTC (rev 267622)
@@ -0,0 +1,11 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+div {
+ text-align: justify;
+ background-color: green;
+ font-family: Ahem;
+ font-size: 20px;
+ width: 200px;
+}
+</style>
+<div>Lorem ipsum dolor<span> sit amet</span></div>
Modified: trunk/Source/WebCore/ChangeLog (267621 => 267622)
--- trunk/Source/WebCore/ChangeLog 2020-09-26 13:52:34 UTC (rev 267621)
+++ trunk/Source/WebCore/ChangeLog 2020-09-26 14:14:13 UTC (rev 267622)
@@ -1,3 +1,15 @@
+2020-09-26 Zalan Bujtas <za...@apple.com>
+
+ [LFC][IFC] Line content logical width expands with run expansions (text-align: justify)
+ https://bugs.webkit.org/show_bug.cgi?id=217011
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/layoutformattingcontext/run-expansion-extends-line-content-width.html
+
+ * layout/inlineformatting/InlineLine.cpp:
+ (WebCore::Layout::Line::applyRunExpansion):
+
2020-09-26 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] Do not set site for cookies twice in case of redirection
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp (267621 => 267622)
--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2020-09-26 13:52:34 UTC (rev 267621)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2020-09-26 14:14:13 UTC (rev 267622)
@@ -111,6 +111,9 @@
run.shrinkHorizontally(-computedExpansion);
accumulatedExpansion += computedExpansion;
}
+ // Content grows as runs expand.
+ m_contentLogicalWidth += accumulatedExpansion;
+ ASSERT(m_contentLogicalWidth == m_horizontalConstraint);
}
void Line::removeTrailingTrimmableContent()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
