Chromium Code Reviews| Index: Source/core/rendering/RenderGrid.cpp |
| diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
| index 9de8da1819b6546d3b10c4c92cbe74e360e9ec30..6c3dfbc84b8d0cbadc588ab93e23f0743f049e2f 100644 |
| --- a/Source/core/rendering/RenderGrid.cpp |
| +++ b/Source/core/rendering/RenderGrid.cpp |
| @@ -411,7 +411,7 @@ LayoutUnit RenderGrid::computeUsedBreadthOfMinLength(TrackSizingDirection direct |
| const Length& trackLength = gridLength.length(); |
| ASSERT(!trackLength.isAuto()); |
| - if (trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage()) |
| + if (trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage() || trackLength.isCalculated()) |
|
Julien - ping for review
2013/09/24 19:09:16
trackLength.isSpecified() :)
|
| return computeUsedBreadthOfSpecifiedLength(direction, trackLength); |
| ASSERT(trackLength.isMinContent() || trackLength.isMaxContent()); |
| @@ -425,7 +425,7 @@ LayoutUnit RenderGrid::computeUsedBreadthOfMaxLength(TrackSizingDirection direct |
| const Length& trackLength = gridLength.length(); |
| ASSERT(!trackLength.isAuto()); |
| - if (trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage()) { |
| + if (trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage() || trackLength.isCalculated()) { |
|
Julien - ping for review
2013/09/24 19:09:16
Ditto.
|
| LayoutUnit computedBreadth = computeUsedBreadthOfSpecifiedLength(direction, trackLength); |
| ASSERT(computedBreadth != infinity); |
| return computedBreadth; |
| @@ -437,8 +437,7 @@ LayoutUnit RenderGrid::computeUsedBreadthOfMaxLength(TrackSizingDirection direct |
| LayoutUnit RenderGrid::computeUsedBreadthOfSpecifiedLength(TrackSizingDirection direction, const Length& trackLength) const |
| { |
| - // FIXME: We still need to support calc() here (https://webkit.org/b/103761). |
| - ASSERT(trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage()); |
| + ASSERT(trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage() || trackLength.isCalculated()); |
|
Julien - ping for review
2013/09/24 19:09:16
Ditto.
|
| // FIXME: The -1 here should be replaced by whatever the intrinsic height of the grid is. |
| return valueForLength(trackLength, direction == ForColumns ? logicalWidth() : computeContentLogicalHeight(style()->logicalHeight(), -1), view()); |
| } |