Title: [261378] trunk
- Revision
- 261378
- Author
- [email protected]
- Date
- 2020-05-08 07:02:00 -0700 (Fri, 08 May 2020)
Log Message
[LFC][TFC] The fixed logical width should be used as the max width for a cell
https://bugs.webkit.org/show_bug.cgi?id=211610
Reviewed by Antti Koivisto.
Source/WebCore:
Test: fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html
* layout/tableformatting/TableFormattingContextGeometry.cpp:
(WebCore::Layout::TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell):
LayoutTests:
* fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content-expected.txt: Added.
* fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (261377 => 261378)
--- trunk/LayoutTests/ChangeLog 2020-05-08 13:51:12 UTC (rev 261377)
+++ trunk/LayoutTests/ChangeLog 2020-05-08 14:02:00 UTC (rev 261378)
@@ -1,3 +1,13 @@
+2020-05-08 Zalan Bujtas <[email protected]>
+
+ [LFC][TFC] The fixed logical width should be used as the max width for a cell
+ https://bugs.webkit.org/show_bug.cgi?id=211610
+
+ Reviewed by Antti Koivisto.
+
+ * fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content-expected.txt: Added.
+ * fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html: Added.
+
2020-05-08 Jason Lawrence <[email protected]>
REGRESSION: [ iOS wk2 ] fast/forms/input-text-scroll-left-on-blur.html is flaky failing.
Added: trunk/LayoutTests/fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content-expected.txt (0 => 261378)
--- trunk/LayoutTests/fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content-expected.txt 2020-05-08 14:02:00 UTC (rev 261378)
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x215
+ RenderBlock {HTML} at (0,0) size 800x215
+ RenderBody {BODY} at (8,8) size 784x199
+ RenderTable {TABLE} at (0,0) size 240x199 [border: (10px solid #008000)]
+ RenderTableSection {TBODY} at (40,40) size 160x119
+ RenderTableRow {TR} at (0,0) size 160x66
+ RenderTableCell {TD} at (0,39) size 80x41 [border: (10px solid #FF0000)] [r=0 c=0 rs=2 cs=1]
+ RenderTableCell {TD} at (80,0) size 80x66 [border: (10px solid #FF0000)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (20,20) size 40x26
+ text run at (20,20) width 40: "fooo fooo"
+ text run at (20,33) width 19: "fooo"
+ RenderTableRow {TR} at (0,66) size 160x53
+ RenderTableCell {TD} at (80,66) size 80x53 [border: (10px solid #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (20,20) size 14x13
+ text run at (20,20) width 14: "foo"
Added: trunk/LayoutTests/fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html (0 => 261378)
--- trunk/LayoutTests/fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html 2020-05-08 14:02:00 UTC (rev 261378)
@@ -0,0 +1,18 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+table {
+ font-size: 10px;
+ border-spacing: 0px;
+ padding: 30px;
+ border: 10px solid green;
+}
+
+td {
+ border: 10px solid red;
+ padding: 10px;
+}
+</style>
+<table>
+<tr><td rowspan=2 style="width: 40px"></td><td style="width: 40px">fooo fooo fooo</td></tr>
+<tr><td style="width: 40px">foo</td></tr>
+</table>
Modified: trunk/Source/WebCore/ChangeLog (261377 => 261378)
--- trunk/Source/WebCore/ChangeLog 2020-05-08 13:51:12 UTC (rev 261377)
+++ trunk/Source/WebCore/ChangeLog 2020-05-08 14:02:00 UTC (rev 261378)
@@ -1,3 +1,15 @@
+2020-05-08 Zalan Bujtas <[email protected]>
+
+ [LFC][TFC] The fixed logical width should be used as the max width for a cell
+ https://bugs.webkit.org/show_bug.cgi?id=211610
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/layoutformattingcontext/table-simple-with-fixed-widht-and-inline-content.html
+
+ * layout/tableformatting/TableFormattingContextGeometry.cpp:
+ (WebCore::Layout::TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell):
+
2020-05-08 Youenn Fablet <[email protected]>
Handle remote audio capture IPC messages in a background thread
Modified: trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp (261377 => 261378)
--- trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp 2020-05-08 13:51:12 UTC (rev 261377)
+++ trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp 2020-05-08 14:02:00 UTC (rev 261378)
@@ -72,7 +72,7 @@
if (cellBox.hasChild())
intrinsicWidthConstraints = LayoutContext::createFormattingContext(cellBox, layoutState())->computedIntrinsicWidthConstraints();
if (auto width = fixedValue(cellBox.style().logicalWidth()))
- return FormattingContext::IntrinsicWidthConstraints { std::max(intrinsicWidthConstraints.minimum, *width), std::max(intrinsicWidthConstraints.maximum, *width) };
+ return FormattingContext::IntrinsicWidthConstraints { std::max(intrinsicWidthConstraints.minimum, *width), *width };
return intrinsicWidthConstraints;
};
// FIXME Check for box-sizing: border-box;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
