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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 2050043005: CL for perf tryjob on linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | tools/run-perf-test.cfg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index 42b653c95eb54e4414c89f684a003bf87686a89f..1ac1d2d35d3cc99dcec4971c84193397ebd0a8ea 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -749,13 +749,15 @@ GridTrackSize LayoutGrid::gridTrackSize(GridTrackSizingDirection direction, size
GridLength maxTrackBreadth = trackSize.maxTrackBreadth();
// If the logical width/height of the grid container is indefinite, percentage values are treated as <auto>.
- // For the inline axis this only happens when we're computing the intrinsic sizes (AvailableSpaceIndefinite).
- // For the block axis we check that the percentage height is resolvable on the first in-flow child.
- if ((sizingOperation == IntrinsicSizeComputation) || (direction == ForRows && firstInFlowChildBox() && !firstInFlowChildBox()->percentageLogicalHeightIsResolvable())) {
- if (minTrackBreadth.hasPercentage())
- minTrackBreadth = Length(Auto);
- if (maxTrackBreadth.hasPercentage())
- maxTrackBreadth = Length(Auto);
+ if (minTrackBreadth.hasPercentage() || maxTrackBreadth.hasPercentage()) {
+ // For the inline axis this only happens when we're computing the intrinsic sizes (AvailableSpaceIndefinite).
+ // For the block axis we check that the percentage height is resolvable on the first in-flow child.
+ if ((sizingOperation == IntrinsicSizeComputation) || (direction == ForRows && firstInFlowChildBox() && !firstInFlowChildBox()->percentageLogicalHeightIsResolvable())) {
+ if (minTrackBreadth.hasPercentage())
+ minTrackBreadth = Length(Auto);
+ if (maxTrackBreadth.hasPercentage())
+ maxTrackBreadth = Length(Auto);
+ }
}
// Flex sizes are invalid as a min sizing function. However we still can have a flexible |minTrackBreadth|
« no previous file with comments | « no previous file | tools/run-perf-test.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698