Source/core/layout/LayoutGrid.cpp - Issue 1070143002: [Alignment] Single class for holding the alignment data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1070143002: [Alignment] Single class for holding the alignment data. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Using the StyleConverter. Created 5 years, 8 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

« Source/core/css/resolver/StyleBuilderConverter.cpp ('K') | « Source/core/layout/LayoutFlexibleBox.cpp ('k') | Source/core/style/ComputedStyle.h » ('j') | Source/core/style/StyleAlignmentData.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutGrid.cpp

diff --git a/Source/core/layout/LayoutGrid.cpp b/Source/core/layout/LayoutGrid.cpp

index d43638f9652f00da8bf127a8b3f19664ad8b8fa3..77028f8eefcbbf2c3003274b31c6457521c6a2f0 100644

--- a/Source/core/layout/LayoutGrid.cpp

+++ b/Source/core/layout/LayoutGrid.cpp

@@ -1132,8 +1132,8 @@ void LayoutGrid::layoutGridItems()

populateGridPositions(sizingData);

m_gridItemsOverflowingGridArea.resize(0);

- LayoutUnit columnOffset = contentPositionAndDistributionColumnOffset(availableSpaceForColumns, style()->justifyContent(), style()->justifyContentDistribution(), style()->justifyContentOverflowAlignment(), m_columnPositions.size() - 1);

- LayoutUnit rowOffset = contentPositionAndDistributionRowOffset(availableSpaceForRows, style()->alignContent(), style()->alignContentDistribution(), style()->alignContentOverflowAlignment(), m_rowPositions.size() - 1);

+ LayoutUnit columnOffset = contentPositionAndDistributionColumnOffset(availableSpaceForColumns, style()->justifyContentPosition(), style()->justifyContentDistribution(), style()->justifyContentOverflowAlignment(), m_columnPositions.size() - 1);

+ LayoutUnit rowOffset = contentPositionAndDistributionRowOffset(availableSpaceForRows, style()->alignContentPosition(), style()->alignContentDistribution(), style()->alignContentOverflowAlignment(), m_rowPositions.size() - 1);

LayoutSize contentPositionOffset(columnOffset, rowOffset);

for (LayoutBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {