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

Unified Diff: Source/core/layout/LayoutFlexibleBox.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/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/layout/LayoutGrid.cpp » ('j') | Source/core/style/StyleAlignmentData.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutFlexibleBox.cpp

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

index 738ab534d44390736205826dcf686afb9d2f49e1..ef0315d2984e31e6ff3b3e2108f14fba0c11869a 100644

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

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

@@ -1070,7 +1070,7 @@ void LayoutFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons

size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);

LayoutUnit autoMarginOffset = autoMarginOffsetInMainAxis(children, availableFreeSpace);

LayoutUnit mainAxisOffset = flowAwareBorderStart() + flowAwarePaddingStart();

- mainAxisOffset += initialJustifyContentOffset(availableFreeSpace, style()->justifyContent(), style()->justifyContentDistribution(), numberOfChildrenForJustifyContent);

+ mainAxisOffset += initialJustifyContentOffset(availableFreeSpace, style()->justifyContentPosition(), style()->justifyContentDistribution(), numberOfChildrenForJustifyContent);

if (style()->flexDirection() == FlowRowReverse)

mainAxisOffset += isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight();

@@ -1161,7 +1161,7 @@ void LayoutFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children,

// just moving the children to a new position.

size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);

LayoutUnit mainAxisOffset = logicalHeight() - flowAwareBorderEnd() - flowAwarePaddingEnd();

- mainAxisOffset -= initialJustifyContentOffset(availableFreeSpace, style()->justifyContent(), style()->justifyContentDistribution(), numberOfChildrenForJustifyContent);

+ mainAxisOffset -= initialJustifyContentOffset(availableFreeSpace, style()->justifyContentPosition(), style()->justifyContentDistribution(), numberOfChildrenForJustifyContent);

mainAxisOffset -= isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight();

size_t seenInFlowPositionedChildren = 0;

@@ -1230,7 +1230,7 @@ void LayoutFlexibleBox::alignFlexLines(Vector<LineContext>& lineContexts)

availableCrossAxisSpace -= lineContexts[i].crossAxisExtent;

LayoutBox* child = m_orderIterator.first();

- LayoutUnit lineOffset = initialAlignContentOffset(availableCrossAxisSpace, style()->alignContent(), style()->alignContentDistribution(), lineContexts.size());

+ LayoutUnit lineOffset = initialAlignContentOffset(availableCrossAxisSpace, style()->alignContentPosition(), style()->alignContentDistribution(), lineContexts.size());

for (unsigned lineNumber = 0; lineNumber < lineContexts.size(); ++lineNumber) {

lineContexts[lineNumber].crossAxisOffset += lineOffset;

for (size_t childNumber = 0; childNumber < lineContexts[lineNumber].numberOfChildren; ++childNumber, child = m_orderIterator.next())