[css-grid] Avoid the relayout forced on orthogonal grid items

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

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 235 matching lines @@
     // information (which may trigger relayout).
     LayoutState state(*this);
 
     LayoutSize previous_size = Size();
     has_definite_logical_height_ = HasDefiniteLogicalHeight();
 
     // Grid's layout logic controls the grid item's override size, hence
     // we need to clear any override size set previously, so it doesn't
     // interfere in current layout execution.
     for (auto* child = FirstInFlowChildBox(); child;
-         child = child->NextInFlowSiblingBox()) {
+         child = child->NextInFlowSiblingBox())
       child->ClearOverrideSize();
-      if (!IsOrthogonalChild(*child) ||
-          (!SizesLogicalWidthToFitContent(StyleRef().LogicalWidth()) &&
-           !StyleRef().LogicalWidth().IsIntrinsicOrAuto()))
-        continue;
-      // Additionally, we may need to clear containingBlock override sizes and
-      // force a layout of the grid items to ensure we get the same result when
-      // grid's intrinsic size is computed again in the updateLogicalWidth call
-      // bellow.
-      child->ClearContainingBlockOverrideSize();
-      child->ForceLayout();
-    }
 
     UpdateLogicalWidth();
 
     TextAutosizer::LayoutScope text_autosizer_layout_scope(this, &layout_scope);
 
     LayoutUnit available_space_for_columns = AvailableLogicalWidth();
     PlaceItemsOnGrid(grid_, available_space_for_columns);
 
     // 1- First, the track sizing algorithm is used to resolve the sizes of the
     // grid columns.
@@ skipping 2125 matching lines @@
   if (direction == kForRows)
     return grid.NumTracks(kForRows);
 
   return grid.NumTracks(kForRows)
              ? grid.NumTracks(kForColumns)
              : GridPositionsResolver::ExplicitGridColumnCount(
                    StyleRef(), grid.AutoRepeatTracks(kForColumns));
 }
 
 }  // namespace blink