third_party/WebKit/Source/core/layout/LayoutGrid.cpp - Issue 1625993004: [css-align] Avoid the style Reattach whenever align-items changes.

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: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 1625993004: [css-align] Avoid the style Reattach whenever align-items changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the parsing tests and skipping the rest. Created 4 years, 11 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

« third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp ('K') | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 1044f1d2ab5fc9a592c3f325b2daa8e29e35eabc..4be23dc0bf8c952f78192a6b26c7b4535bb9f89a 100644

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

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

@@ -1905,7 +1905,8 @@ LayoutUnit LayoutGrid::columnAxisOffsetForChild(const LayoutBox& child) const

LayoutUnit childBreadth = child.logicalHeight() + child.marginLogicalHeight();

if (childEndLine - childStartLine > 1 && childEndLine < m_rowPositions.size() - 1)

endOfRow -= offsetBetweenTracks(styleRef().alignContentDistribution(), m_rowPositions, childBreadth);

- LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(child.styleRef().alignSelfOverflowAlignment(), endOfRow - startOfRow, childBreadth);

+ OverflowAlignment overflow = ComputedStyle::resolvedAlignment(styleRef(), child.styleRef(), ItemPositionStretch).overflow();

esprehn 2016/01/29 04:20:55 this should be an instance method. styleRef().res

+ LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(overflow, endOfRow - startOfRow, childBreadth);

return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);

}