[css-grid] Clearing the override height before layout

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/GridTrackSizingAlgorithm.h"
 
 #include "core/layout/Grid.h"
 #include "core/layout/LayoutGrid.h"
 #include "platform/LengthFunctions.h"
 
@@ skipping 263 matching lines @@
 
   // If |child| has a relative logical height, we shouldn't let it override its
   // intrinsic height, which is what we are interested in here. Thus we need to
   // set the block-axis override size to -1 (no possible resolution).
   if (ShouldClearOverrideContainingBlockContentSizeForChild(child, kForRows)) {
     SetOverrideContainingBlockContentSizeForChild(child, child_block_direction,
                                                   LayoutUnit(-1));
     child.SetNeedsLayout(LayoutInvalidationReason::kGridChanged, kMarkOnlyThis);
   }
 
-  // We need to clear the stretched height to properly compute logical height
-  // during layout.
-  if (child.NeedsLayout())
-    child.ClearOverrideLogicalContentHeight();
-
   child.LayoutIfNeeded();
   GridAxis baseline_axis = GetLayoutGrid()->IsOrthogonalChild(child)
                                ? kGridRowAxis
                                : kGridColumnAxis;
   if (GetLayoutGrid()->IsBaselineAlignmentForChild(child, baseline_axis) &&
       GetLayoutGrid()->IsBaselineContextComputed(baseline_axis)) {
     auto& group =
         GetLayoutGrid()->GetBaselineGroupForChild(child, baseline_axis);
     return group.MaxAscent() + group.MaxDescent();
   }
@@ skipping 1194 matching lines @@
   DCHECK(algorithm_.IsValidTransition());
   DCHECK(!algorithm_.needs_setup_);
 }
 
 GridTrackSizingAlgorithm::StateMachine::~StateMachine() {
   algorithm_.AdvanceNextState();
   algorithm_.needs_setup_ = true;
 }
 
 }  // namespace blink