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 5c74e7d82503881d52d17441c2da1594cd0fb001..e86c389665eb0f5d28db94388b1d417836c88ca9 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
@@ -105,8 +105,9 @@ void LayoutGrid::styleDidChange(StyleDifference diff, |
if (explicitGridDidResize(*oldStyle) || |
namedGridLinesDefinitionDidChange(*oldStyle) || |
oldStyle->getGridAutoFlow() != styleRef().getGridAutoFlow() || |
- (diff.needsLayout() && (styleRef().gridAutoRepeatColumns().size() || |
- styleRef().gridAutoRepeatRows().size()))) |
+ (diff.needsLayout() && |
+ (styleRef().gridAutoRepeatColumns().size() || |
+ styleRef().gridAutoRepeatRows().size()))) |
dirtyGrid(); |
} |
@@ -146,9 +147,9 @@ LayoutUnit LayoutGrid::computeTrackBasedLogicalHeight() const { |
void LayoutGrid::computeTrackSizesForDefiniteSize( |
GridTrackSizingDirection direction, |
LayoutUnit availableSpace) { |
- LayoutUnit freeSpace = |
- availableSpace - guttersSize(m_grid, direction, 0, |
- m_grid.numTracks(direction), TrackSizing); |
+ LayoutUnit freeSpace = availableSpace - |
+ guttersSize(m_grid, direction, 0, |
+ m_grid.numTracks(direction), TrackSizing); |
m_trackSizingAlgorithm.setup(direction, numTracks(direction, m_grid), |
TrackSizing, availableSpace, freeSpace); |
m_trackSizingAlgorithm.run(); |
@@ -1610,8 +1611,9 @@ int LayoutGrid::firstLineBoxBaseline() const { |
} |
if (!baselineChild) { |
// Use dom order for items in the same cell. |
- if (!firstChild || (m_grid.gridItemPaintOrder(*child) < |
- m_grid.gridItemPaintOrder(*firstChild))) |
+ if (!firstChild || |
+ (m_grid.gridItemPaintOrder(*child) < |
+ m_grid.gridItemPaintOrder(*firstChild))) |
firstChild = child; |
} |
} |
@@ -1843,9 +1845,9 @@ LayoutUnit LayoutGrid::columnAxisOffsetForChild(const LayoutBox& child) const { |
OverflowAlignment overflow = alignSelfForChild(child).overflow(); |
LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset( |
overflow, endOfRow - startOfRow, columnAxisChildSize); |
- return startPosition + (axisPosition == GridAxisEnd |
- ? offsetFromStartPosition |
- : offsetFromStartPosition / 2); |
+ return startPosition + |
+ (axisPosition == GridAxisEnd ? offsetFromStartPosition |
+ : offsetFromStartPosition / 2); |
} |
} |
@@ -1885,9 +1887,9 @@ LayoutUnit LayoutGrid::rowAxisOffsetForChild(const LayoutBox& child) const { |
OverflowAlignment overflow = justifySelfForChild(child).overflow(); |
LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset( |
overflow, endOfColumn - startOfColumn, rowAxisChildSize); |
- return startPosition + (axisPosition == GridAxisEnd |
- ? offsetFromStartPosition |
- : offsetFromStartPosition / 2); |
+ return startPosition + |
+ (axisPosition == GridAxisEnd ? offsetFromStartPosition |
+ : offsetFromStartPosition / 2); |
} |
} |
@@ -1960,11 +1962,10 @@ ContentAlignmentData LayoutGrid::computeContentPositionAndDistributionOffset( |
: styleRef().resolvedAlignContentPosition( |
contentAlignmentNormalBehavior()); |
ContentDistributionType distribution = |
- isRowAxis |
- ? styleRef().resolvedJustifyContentDistribution( |
- contentAlignmentNormalBehavior()) |
- : styleRef().resolvedAlignContentDistribution( |
- contentAlignmentNormalBehavior()); |
+ isRowAxis ? styleRef().resolvedJustifyContentDistribution( |
+ contentAlignmentNormalBehavior()) |
+ : styleRef().resolvedAlignContentDistribution( |
+ contentAlignmentNormalBehavior()); |
// If <content-distribution> value can't be applied, 'position' will become |
// the associated <content-position> fallback value. |
ContentAlignmentData contentAlignment = contentDistributionOffset( |