[TablesNG] Columns take precedence in table-layout:fixed

Inside table-layout:fixed, columns always take precedence
over cells.

Updated wpt column widths test.

Bug: 958381, 832323
Change-Id: I07e682d9e41218774889d9517a0e4d652bbecd68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575724Reviewed-by: David Grogan <dgrogan@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833995}

third_party/blink/renderer/core/layout/ng/table/ng_table_layout_algorithm_types.cc

@@ -76,7 +76,8 @@ constexpr LayoutUnit NGTableTypes::kTableMaxInlineSize;
 // "outer min-content and outer max-content widths for colgroups"
 NGTableTypes::Column NGTableTypes::CreateColumn(
     const ComputedStyle& style,
-    base::Optional<LayoutUnit> default_inline_size) {
+    base::Optional<LayoutUnit> default_inline_size,
+    bool is_table_fixed) {
   base::Optional<LayoutUnit> inline_size;
   base::Optional<LayoutUnit> min_inline_size;
   base::Optional<LayoutUnit> max_inline_size;
@@ -97,7 +98,8 @@ NGTableTypes::Column NGTableTypes::CreateColumn(
                 percentage_inline_size,
                 LayoutUnit() /* percent_border_padding */,
                 is_constrained,
-                is_collapsed};
+                is_collapsed,
+                is_table_fixed};
 }
 
 // Implements https://www.w3.org/TR/css-tables-3/#computing-cell-measures
@@ -282,6 +284,10 @@ void NGTableTypes::Column::Encompass(
   if (!cell)
     return;
 
+  // Constrained columns in fixed tables take precedence over cells.
+  if (is_constrained && is_table_fixed)
+    return;
+
   if (min_inline_size) {
     if (min_inline_size < cell->min_inline_size) {
       min_inline_size = cell->min_inline_size;

third_party/blink/renderer/core/layout/ng/table/ng_table_layout_algorithm_types.h

@@ -66,6 +66,7 @@ class CORE_EXPORT NGTableTypes {
     // True if any cell for this column is constrained.
     bool is_constrained = false;
     bool is_collapsed = false;
+    bool is_table_fixed = false;
 
     void Encompass(const base::Optional<NGTableTypes::CellInlineConstraint>&);
     LayoutUnit ResolvePercentInlineSize(
@@ -180,7 +181,8 @@ class CORE_EXPORT NGTableTypes {
   };
 
   static Column CreateColumn(const ComputedStyle&,
-                             base::Optional<LayoutUnit> default_inline_size);
+                             base::Optional<LayoutUnit> default_inline_size,
+                             bool is_table_fixed);
 
   static CellInlineConstraint CreateCellInlineConstraint(
       const NGBlockNode&,

third_party/blink/renderer/core/layout/ng/table/ng_table_layout_algorithm_utils.cc

@@ -243,10 +243,12 @@ class ColumnConstraintsBuilder {
                 wtf_size_t span) {
     // COL creates SPAN constraints. Its width is col css width, or enclosing
     // colgroup css width.
-    NGTableTypes::Column col_constraint = NGTableTypes::CreateColumn(
-        column.Style(), !is_fixed_layout_ && colgroup_constraint_
-                            ? colgroup_constraint_->max_inline_size
-                            : base::nullopt);
+    NGTableTypes::Column col_constraint =
+        NGTableTypes::CreateColumn(column.Style(),
+                                   !is_fixed_layout_ && colgroup_constraint_
+                                       ? colgroup_constraint_->max_inline_size
+                                       : base::nullopt,
+                                   is_fixed_layout_);
     for (wtf_size_t i = 0; i < span; ++i)
       column_constraints_->data.push_back(col_constraint);
     column.GetLayoutBox()->ClearNeedsLayout();
@@ -254,8 +256,8 @@ class ColumnConstraintsBuilder {
 
   void EnterColgroup(const NGLayoutInputNode& colgroup,
                      wtf_size_t start_column_index) {
-    colgroup_constraint_ =
-        NGTableTypes::CreateColumn(colgroup.Style(), base::nullopt);
+    colgroup_constraint_ = NGTableTypes::CreateColumn(
+        colgroup.Style(), base::nullopt, is_fixed_layout_);
   }
 
   void LeaveColgroup(const NGLayoutInputNode& colgroup,

third_party/blink/web_tests/external/wpt/css/css-tables/tentative/column-widths-expected.txt

@@ -39,5 +39,7 @@ PASS table 28
 PASS table 29
 PASS table 30
 PASS table 31
+PASS table 32
+PASS table 33
 Harness: the test ran to completion.
 

third_party/blink/web_tests/external/wpt/css/css-tables/tentative/column-widths.html

@@ -276,7 +276,23 @@ column.max = max(td.max, col.max)</p>
 <table style="width:1px" data-expected-width=234>
   <col style="width:50%">
   <td style="width:100px" data-expected-width=10><div style="width:10px">10</div></td>
-  <td><div style="width:200px">200</div>
+  <td><div style="width:200px">200</div></td>
+</table>
+
+<p class="testdesc">col fixed td fixed inside table-layout:fixed
+constrained columns take precedence in fixed layout.
+<table style="width:324px;table-layout:fixed" data-expected-width=324>
+  <col style="width:100px">
+  <td style="width:200px" data-expected-width=100>100</td>
+  <td data-expected-width=200><div style="width:400px" >200</div></td>
+</table>
+
+<p class="testdesc">col percent td fixed inside table-layout:fixed
+constrained columns take precedence in fixed layout.
+<table style="width:324px;table-layout:fixed" data-expected-width=324>
+  <col style="width:50%">
+  <td style="width:200px" data-expected-width=150>150</td>
+  <td><div style="width:400px">150</div></td>
 </table>
 </main>
 <script>