| Index: Source/core/rendering/RenderFlexibleBox.cpp
|
| diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
|
| index ac521afa8851e844eb03a29d29172a7646476ada..4f4323fdd78bac44ac00493e305f44edeeb2213b 100644
|
| --- a/Source/core/rendering/RenderFlexibleBox.cpp
|
| +++ b/Source/core/rendering/RenderFlexibleBox.cpp
|
| @@ -244,13 +244,6 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren)
|
|
|
| LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
|
|
|
| - // Regions changing widths can force us to relayout our children.
|
| - RenderFlowThread* flowThread = flowThreadContainingBlock();
|
| - if (logicalWidthChangedInRegions(flowThread))
|
| - relayoutChildren = true;
|
| - if (updateRegionsAndShapesLogicalSize(flowThread))
|
| - relayoutChildren = true;
|
| -
|
| m_numberOfInFlowChildrenOnFirstLine = -1;
|
|
|
| RenderBlock::startDelayUpdateScrollInfo();
|
| @@ -273,8 +266,6 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren)
|
|
|
| layoutPositionedObjects(relayoutChildren || isRoot());
|
|
|
| - computeRegionRangeForBlock(flowThread);
|
| -
|
| repaintChildrenDuringLayoutIfMoved(oldChildRects);
|
| // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.
|
| computeOverflow(clientLogicalBottomAfterRepositioning());
|
| @@ -448,9 +439,7 @@ LayoutUnit RenderFlexibleBox::computeMainAxisExtentForChild(RenderBox* child, Si
|
| child->layoutIfNeeded();
|
| return child->computeContentLogicalHeight(size, child->logicalHeight() - child->borderAndPaddingLogicalHeight());
|
| }
|
| - // FIXME: Figure out how this should work for regions and pass in the appropriate values.
|
| - RenderRegion* region = 0;
|
| - return child->computeLogicalWidthInRegionUsing(sizeType, size, contentLogicalWidth(), this, region) - child->borderAndPaddingLogicalWidth();
|
| + return child->computeLogicalWidthUsing(sizeType, size, contentLogicalWidth(), this) - child->borderAndPaddingLogicalWidth();
|
| }
|
|
|
| WritingMode RenderFlexibleBox::transformedWritingMode() const
|
| @@ -1018,7 +1007,7 @@ void RenderFlexibleBox::prepareChildForPositionedLayout(RenderBox* child, Layout
|
| LayoutUnit inlinePosition = isColumnFlow() ? crossAxisOffset : mainAxisOffset;
|
| if (layoutMode == FlipForRowReverse && style()->flexDirection() == FlowRowReverse)
|
| inlinePosition = mainAxisExtent() - mainAxisOffset;
|
| - childLayer->setStaticInlinePosition(inlinePosition); // FIXME: Not right for regions.
|
| + childLayer->setStaticInlinePosition(inlinePosition);
|
|
|
| LayoutUnit staticBlockPosition = isColumnFlow() ? mainAxisOffset : crossAxisOffset;
|
| if (childLayer->staticBlockPosition() != staticBlockPosition) {
|
| @@ -1358,7 +1347,7 @@ void RenderFlexibleBox::applyStretchAlignmentToChild(RenderBox* child, LayoutUni
|
| // FIXME: If the child doesn't have orthogonal flow, then it already has an override width set, so use it.
|
| if (hasOrthogonalFlow(child)) {
|
| LayoutUnit childWidth = std::max<LayoutUnit>(0, lineCrossAxisExtent - crossAxisMarginExtentForChild(child));
|
| - childWidth = child->constrainLogicalWidthInRegionByMinMax(childWidth, childWidth, this);
|
| + childWidth = child->constrainLogicalWidthByMinMax(childWidth, childWidth, this);
|
|
|
| if (childWidth != child->logicalWidth()) {
|
| child->setOverrideLogicalContentWidth(childWidth - child->borderAndPaddingLogicalWidth());
|
|
|