[css-grid] Improve intrinsic size computation with orthogonal flows

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

Index: third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
diff --git a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
index cf41414466b10852dfa7063396d2510762f4ffb4..79d68e6c9d32373638be38aa298f76e154c0051d 100644
--- a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
+++ b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
@@ -303,18 +303,6 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::minContentForChild(
     return child.minPreferredLogicalWidth() + marginLogicalWidth;
   }
 
-  // All orthogonal flow boxes were already laid out during an early layout
-  // phase performed in FrameView::performLayout.
-  // It's true that grid track sizing was not completed at that time and it may
-  // afffect the final height of a grid item, but since it's forbidden to
-  // perform a layout during intrinsic width computation, we have to use that
-  // computed height for now.
-  if (direction() == ForColumns &&
-      m_algorithm.m_sizingOperation == IntrinsicSizeComputation) {
-    DCHECK(layoutGrid()->isOrthogonalChild(child));
-    return child.logicalHeight() + child.marginLogicalHeight();

[jfernandez, 2017/02/15 22:49:58]

Removing this code implies that we will mark the grid item for layout, if the
override size (its virtual containing block) has changed, and indeed perform
such layout in logicalHeightForChild in order to compute the column track's
width. 

For the record, I'm totally fine with it, since we were already doing it in the
FrameView, but just wanted to make it more explicit here to be considered by
other reviewers.

-  }
-
   if (updateOverrideContainingBlockContentSizeForChild(child,
                                                        childInlineDirection))
     child.setNeedsLayout(LayoutInvalidationReason::GridChanged);
@@ -346,17 +334,6 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::maxContentForChild(
     return child.maxPreferredLogicalWidth() + marginLogicalWidth;
   }
 
-  if (direction() == ForColumns &&
-      m_algorithm.m_sizingOperation == IntrinsicSizeComputation) {
-    // All orthogonal flow boxes were already laid out during an early layout
-    // phase performed in FrameView::performLayout. It's true that grid track
-    // sizing was not completed at that time and it may afffect the final height
-    // of a grid item, but since it's forbidden to perform a layout during
-    // intrinsic width computation, we have to use that computed height for now.
-    DCHECK(layoutGrid()->isOrthogonalChild(child));
-    return child.logicalHeight() + child.marginLogicalHeight();

[jfernandez, 2017/02/15 22:49:58]

Ditto.

-  }
-
   if (updateOverrideContainingBlockContentSizeForChild(child,
                                                        childInlineDirection))
     child.setNeedsLayout(LayoutInvalidationReason::GridChanged);