[css-grid] Clearing the override height before layout

third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index 957ecad4da47dc281d667cbd7d469519da0556cd..871ef7219176a08783615ffbefae9ebc0df4f4f6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -236,13 +236,13 @@ void LayoutGrid::UpdateBlockLayout(bool relayout_children) {
     // We need to clear both own and containingBlock override sizes to
     // ensure we get the same result when grid's intrinsic size is
     // computed again in the updateLogicalWidth call bellow.

[Manuel Rego, 2017/04/21 05:21:11]

This comment needs to be updated now.

[jfernandez, 2017/04/21 08:31:47]

Well, the comment still applies, IMO. It's just that we clear the item's
overrideSize in any case. However, in the case of content-sized
grid container we still need to cleare the containingBlockOverride size and
force a layout, as the comment states.

[Manuel Rego, 2017/04/21 08:51:51]

But the comment says:
// We need to clear both **own** and containingBlock override sizes

Before we clear both if that condition applies, now we clear it always.
That's why I say the comment needs to be updated.

-    if (SizesLogicalWidthToFitContent(StyleRef().LogicalWidth()) ||
-        StyleRef().LogicalWidth().IsIntrinsicOrAuto()) {
-      for (auto* child = FirstInFlowChildBox(); child;
-           child = child->NextInFlowSiblingBox()) {
+    for (auto* child = FirstInFlowChildBox(); child;
+         child = child->NextInFlowSiblingBox()) {
+      child->ClearOverrideSize();
+      if (SizesLogicalWidthToFitContent(StyleRef().LogicalWidth()) ||
+          StyleRef().LogicalWidth().IsIntrinsicOrAuto()) {
         if (!IsOrthogonalChild(*child))
           continue;
-        child->ClearOverrideSize();
         child->ClearContainingBlockOverrideSize();
         child->ForceLayout();
       }
@@ -1527,11 +1527,6 @@ GridTrackSizingDirection LayoutGrid::FlowAwareDirectionForChild(
 // FIXME: This logic is shared by LayoutFlexibleBox, so it should be moved to
 // LayoutBox.
 void LayoutGrid::ApplyStretchAlignmentToChildIfNeeded(LayoutBox& child) {
-  // We clear height override values because we will decide now whether it's
-  // allowed or not, evaluating the conditions which might have changed since
-  // the old values were set.
-  child.ClearOverrideLogicalContentHeight();
-
   GridTrackSizingDirection child_block_direction =
       FlowAwareDirectionForChild(child, kForRows);
   bool block_flow_is_column_axis = child_block_direction == kForRows;