Chromium Code Reviews| 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 a9a34506718a057c877a0e28a7aa909dffe48fdb..bf6bd6c7d3566b0d43daa8aa67d55e652fc6e950 100644 |
| --- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
| +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
| @@ -1418,24 +1418,28 @@ LayoutUnit LayoutGrid::availableAlignmentSpaceForChildBeforeStretching( |
| StyleSelfAlignmentData LayoutGrid::alignSelfForChild( |
| const LayoutBox& child) const { |
| - if (!child.isAnonymous()) |
| - return child.styleRef().resolvedAlignSelf(selfAlignmentNormalBehavior()); |
| + if (!child.isAnonymous()) { |
|
jfernandez
2017/03/01 12:46:49
Perhaps it'd be a better idea to solve directly th
|
| + return child.styleRef().resolvedAlignSelf( |
| + selfAlignmentNormalBehavior(&child)); |
| + } |
| // All the 'auto' values has been solved by the StyleAdjuster, but it's |
| // possible that some grid items generate Anonymous boxes, which need to be |
| // solved during layout. |
| - return child.styleRef().resolvedAlignSelf(selfAlignmentNormalBehavior(), |
| + return child.styleRef().resolvedAlignSelf(selfAlignmentNormalBehavior(&child), |
| style()); |
| } |
| StyleSelfAlignmentData LayoutGrid::justifySelfForChild( |
| const LayoutBox& child) const { |
| - if (!child.isAnonymous()) |
| - return child.styleRef().resolvedJustifySelf(ItemPositionStretch); |
| + if (!child.isAnonymous()) { |
|
jfernandez
2017/03/01 12:46:49
ditto.
|
| + return child.styleRef().resolvedJustifySelf( |
| + selfAlignmentNormalBehavior(&child)); |
| + } |
| // All the 'auto' values has been solved by the StyleAdjuster, but it's |
| // possible that some grid items generate Anonymous boxes, which need to be |
| // solved during layout. |
| - return child.styleRef().resolvedJustifySelf(selfAlignmentNormalBehavior(), |
| - style()); |
| + return child.styleRef().resolvedJustifySelf( |
| + selfAlignmentNormalBehavior(&child), style()); |
| } |
| GridTrackSizingDirection LayoutGrid::flowAwareDirectionForChild( |