Index: Source/core/layout/LayoutGrid.cpp |
diff --git a/Source/core/layout/LayoutGrid.cpp b/Source/core/layout/LayoutGrid.cpp |
index 56826d06c9350e129bc8fc841290ceabc90320d6..049a749f8df9c6d7b569a6f106863c2af03e1973 100644 |
--- a/Source/core/layout/LayoutGrid.cpp |
+++ b/Source/core/layout/LayoutGrid.cpp |
@@ -525,7 +525,7 @@ LayoutUnit LayoutGrid::computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirect |
{ |
ASSERT(trackLength.isSpecified()); |
// FIXME: The -1 here should be replaced by whatever the intrinsic height of the grid is. |
- return valueForLength(trackLength, direction == ForColumns ? logicalWidth() : std::max(LayoutUnit(), computeContentLogicalHeight(MainOrPreferredSize, style()->logicalHeight(), -1))); |
+ return valueForLength(trackLength, direction == ForColumns ? logicalWidth() - borderAndPaddingLogicalWidth() : std::max(LayoutUnit(), computeContentLogicalHeight(MainOrPreferredSize, style()->logicalHeight(), -1))); |
cbiesinger
2015/10/08 20:51:24
I'm way too late here, but... maybe use contentLog
Manuel Rego
2015/10/09 13:16:24
Yeah, that was changed a few days later in:
https:
|
} |
static bool sortByGridNormalizedFlexValue(const GridTrackForNormalization& track1, const GridTrackForNormalization& track2) |