Index: Source/core/rendering/RenderGrid.cpp |
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
index 9de8da1819b6546d3b10c4c92cbe74e360e9ec30..439755ab79a018c496c32e40bf4baf025640f947 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.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.isSpecified()) { |
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.isSpecified()); |
// 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()); |
} |