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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 2407243002: [css-grid] Use min-size instead of min-content for intrinsic maximums (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 ASSERT_NOT_REACHED(); 1509 ASSERT_NOT_REACHED();
1510 } 1510 }
1511 1511
1512 LayoutUnit LayoutGrid::currentItemSizeForTrackSizeComputationPhase( 1512 LayoutUnit LayoutGrid::currentItemSizeForTrackSizeComputationPhase(
1513 TrackSizeComputationPhase phase, 1513 TrackSizeComputationPhase phase,
1514 LayoutBox& gridItem, 1514 LayoutBox& gridItem,
1515 GridTrackSizingDirection direction, 1515 GridTrackSizingDirection direction,
1516 GridSizingData& sizingData) const { 1516 GridSizingData& sizingData) const {
1517 switch (phase) { 1517 switch (phase) {
1518 case ResolveIntrinsicMinimums: 1518 case ResolveIntrinsicMinimums:
1519 case ResolveIntrinsicMaximums:
1519 return minSizeForChild(gridItem, direction, sizingData); 1520 return minSizeForChild(gridItem, direction, sizingData);
1520 case ResolveContentBasedMinimums: 1521 case ResolveContentBasedMinimums:
1521 case ResolveIntrinsicMaximums:
1522 return minContentForChild(gridItem, direction, sizingData); 1522 return minContentForChild(gridItem, direction, sizingData);
1523 case ResolveMaxContentMinimums: 1523 case ResolveMaxContentMinimums:
1524 case ResolveMaxContentMaximums: 1524 case ResolveMaxContentMaximums:
1525 return maxContentForChild(gridItem, direction, sizingData); 1525 return maxContentForChild(gridItem, direction, sizingData);
1526 case MaximizeTracks: 1526 case MaximizeTracks:
1527 ASSERT_NOT_REACHED(); 1527 ASSERT_NOT_REACHED();
1528 return LayoutUnit(); 1528 return LayoutUnit();
1529 } 1529 }
1530 1530
1531 ASSERT_NOT_REACHED(); 1531 ASSERT_NOT_REACHED();
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after
3308 if (!m_gridItemArea.isEmpty()) 3308 if (!m_gridItemArea.isEmpty())
3309 GridPainter(*this).paintChildren(paintInfo, paintOffset); 3309 GridPainter(*this).paintChildren(paintInfo, paintOffset);
3310 } 3310 }
3311 3311
3312 bool LayoutGrid::cachedHasDefiniteLogicalHeight() const { 3312 bool LayoutGrid::cachedHasDefiniteLogicalHeight() const {
3313 SECURITY_DCHECK(m_hasDefiniteLogicalHeight); 3313 SECURITY_DCHECK(m_hasDefiniteLogicalHeight);
3314 return m_hasDefiniteLogicalHeight.value(); 3314 return m_hasDefiniteLogicalHeight.value();
3315 } 3315 }
3316 3316
3317 } // namespace blink 3317 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698