[css-grid] Only clear the override size for relative margin/padding

The patch landed in r699290 tried to avoid errors when computing the
the used value of relative margins or padding due old/outdated item's
override size. The solution was to clear the both the inline and block
override size whenever an item had an intrinsic or auto size, or a
relative margin or padding.

However, the change mentioned above caused a performance regression, as
described in the bug. The root cause is an excessive number of relayouts
of the items that had to clear their override-size.

This CL tries to solve the performance issue by reducing the cases where
the override-size has to be cleared. It's not necessary to reset the
inline override-size unless the item has relative margin or padding.

Bug: 1046310
Change-Id: I988ab05e0552af75bf57f5d82dc73714f377ca0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033507Reviewed-by: Manuel Rego <rego@igalia.com>
Commit-Queue: Javier Fernandez <jfernandez@igalia.com>
Cr-Commit-Position: refs/heads/master@{#737766}

third_party/blink/renderer/core/layout/grid_track_sizing_algorithm.cc

@@ -148,29 +148,47 @@ class DefiniteSizeStrategy final : public GridTrackSizingAlgorithmStrategy {
 
 GridTrackSizingAlgorithmStrategy::~GridTrackSizingAlgorithmStrategy() = default;
 
-bool GridTrackSizingAlgorithmStrategy::
-    ShouldClearOverrideContainingBlockContentSizeForChild(
-        const LayoutGrid& grid,
-        const LayoutBox& child,
-        GridTrackSizingDirection direction) {
+bool GridTrackSizingAlgorithmStrategy::HasRelativeMarginOrPaddingForChild(
+    const LayoutGrid& grid,
+    const LayoutBox& child,
+    GridTrackSizingDirection direction) {
   GridTrackSizingDirection child_inline_direction =
       GridLayoutUtils::FlowAwareDirectionForChild(grid, child, kForColumns);
   if (direction == child_inline_direction) {
-    return child.HasRelativeLogicalWidth() ||
-           child.StyleRef().LogicalWidth().IsIntrinsicOrAuto() ||
-           child.StyleRef().MarginStart().IsPercentOrCalc() ||
+    return child.StyleRef().MarginStart().IsPercentOrCalc() ||
            child.StyleRef().MarginEnd().IsPercentOrCalc() ||
            child.StyleRef().PaddingStart().IsPercentOrCalc() ||
            child.StyleRef().PaddingEnd().IsPercentOrCalc();
   }
-  return child.HasRelativeLogicalHeight() ||
-         child.StyleRef().LogicalHeight().IsIntrinsicOrAuto() ||
-         child.StyleRef().MarginBefore().IsPercentOrCalc() ||
+  return child.StyleRef().MarginBefore().IsPercentOrCalc() ||
          child.StyleRef().MarginAfter().IsPercentOrCalc() ||
          child.StyleRef().PaddingBefore().IsPercentOrCalc() ||
          child.StyleRef().PaddingAfter().IsPercentOrCalc();
 }
 
+bool GridTrackSizingAlgorithmStrategy::HasRelativeOrIntrinsicSizeForChild(
+    const LayoutGrid& grid,
+    const LayoutBox& child,
+    GridTrackSizingDirection direction) {
+  GridTrackSizingDirection child_inline_direction =
+      GridLayoutUtils::FlowAwareDirectionForChild(grid, child, kForColumns);
+  if (direction == child_inline_direction) {
+    return child.HasRelativeLogicalWidth() ||
+           child.StyleRef().LogicalWidth().IsIntrinsicOrAuto();
+  }
+  return child.HasRelativeLogicalHeight() ||
+         child.StyleRef().LogicalHeight().IsIntrinsicOrAuto();
+}
+
+bool GridTrackSizingAlgorithmStrategy::
+    ShouldClearOverrideContainingBlockContentSizeForChild(
+        const LayoutGrid& grid,
+        const LayoutBox& child,
+        GridTrackSizingDirection direction) {
+  return HasRelativeOrIntrinsicSizeForChild(grid, child, direction) ||
+         HasRelativeMarginOrPaddingForChild(grid, child, direction);
+}
+
 void GridTrackSizingAlgorithmStrategy::
     SetOverrideContainingBlockContentSizeForChild(
         LayoutBox& child,
@@ -571,8 +589,11 @@ LayoutUnit DefiniteSizeStrategy::MinLogicalSizeForChild(
                                                   kForColumns);
   LayoutUnit indefinite_size =
       Direction() == child_inline_direction ? LayoutUnit() : LayoutUnit(-1);
-  if (ShouldClearOverrideContainingBlockContentSizeForChild(
-          *GetLayoutGrid(), child, Direction())) {
+  if (HasRelativeMarginOrPaddingForChild(*GetLayoutGrid(), child,
+                                         Direction()) ||
+      (Direction() != child_inline_direction &&
+       HasRelativeOrIntrinsicSizeForChild(*GetLayoutGrid(), child,
+                                          Direction()))) {
     SetOverrideContainingBlockContentSizeForChild(child, Direction(),
                                                   indefinite_size);
   }

third_party/blink/renderer/core/layout/grid_track_sizing_algorithm.h

@@ -341,6 +341,12 @@ class GridTrackSizingAlgorithmStrategy {
   }
 
   // Helper functions
+  static bool HasRelativeMarginOrPaddingForChild(const LayoutGrid&,
+                                                 const LayoutBox& child,
+                                                 GridTrackSizingDirection);
+  static bool HasRelativeOrIntrinsicSizeForChild(const LayoutGrid&,
+                                                 const LayoutBox& child,
+                                                 GridTrackSizingDirection);
   static bool ShouldClearOverrideContainingBlockContentSizeForChild(
       const LayoutGrid&,
       const LayoutBox& child,