[css-grid] Apply flow-aware logic for margins during stretching

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 1465 matching lines @@
       // If we overflow our alignment container and overflow is 'true'
       // (default), we ignore the overflow and just return the value regardless
       // (which may cause data loss as we overflow the 'start' edge).
       return offset;
   }
 
   NOTREACHED();
   return LayoutUnit();
 }
 
-// FIXME: This logic is shared by LayoutFlexibleBox, so it should be moved to
-// LayoutBox.
-LayoutUnit LayoutGrid::MarginLogicalHeightForChild(
+LayoutUnit LayoutGrid::MarginLogicalSizeForChild(
+    GridTrackSizingDirection direction,
     const LayoutBox& child) const {
-  return IsHorizontalWritingMode() ? child.MarginHeight() : child.MarginWidth();
+  return FlowAwareDirectionForChild(child, direction) == kForColumns
+             ? child.MarginLogicalWidth()
+             : child.MarginLogicalHeight();
 }
 
 LayoutUnit LayoutGrid::ComputeMarginLogicalSizeForChild(
     MarginDirection for_direction,
     const LayoutBox& child) const {
   if (!child.StyleRef().HasMargin())
     return LayoutUnit();
 
   bool is_row_axis = for_direction == kInlineDirection;
   LayoutUnit margin_start;
@@ skipping 12 matching lines @@
   return margin_start + margin_end;
 }
 
 LayoutUnit LayoutGrid::AvailableAlignmentSpaceForChildBeforeStretching(
     LayoutUnit grid_area_breadth_for_child,
     const LayoutBox& child) const {
   // Because we want to avoid multiple layouts, stretching logic might be
   // performed before children are laid out, so we can't use the child cached
   // values. Hence, we need to compute margins in order to determine the
   // available height before stretching.
+  GridTrackSizingDirection child_block_flow_direction =
+      FlowAwareDirectionForChild(child, kForRows);
   return grid_area_breadth_for_child -
          (child.NeedsLayout()
               ? ComputeMarginLogicalSizeForChild(kBlockDirection, child)
-              : MarginLogicalHeightForChild(child));
+              : MarginLogicalSizeForChild(child_block_flow_direction, child));
 }
 
 StyleSelfAlignmentData LayoutGrid::AlignSelfForChild(
     const LayoutBox& child) const {
   if (!child.IsAnonymous()) {
     return child.StyleRef().ResolvedAlignSelf(
         SelfAlignmentNormalBehavior(&child));
   }
   // All the 'auto' values has been solved by the StyleAdjuster, but it's
   // possible that some grid items generate Anonymous boxes, which need to be
@@ skipping 851 matching lines @@
   if (direction == kForRows)
     return grid.NumTracks(kForRows);
 
   return grid.NumTracks(kForRows)
              ? grid.NumTracks(kForColumns)
              : GridPositionsResolver::ExplicitGridColumnCount(
                    StyleRef(), grid.AutoRepeatTracks(kForColumns));
 }
 
 }  // namespace blink