Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1588)

Unified Diff: Source/core/rendering/RenderGrid.cpp

Issue 23472008: [CSS Grid Layout] Support calc() breadth track size (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@103761-wk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
}

Powered by Google App Engine
This is Rietveld 408576698