| Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| index 2e1103f65a85db7fe9a79a2409298d0292417909..fbb4fe127a10e50fbfdef03fa42f5d31ff02ccc7 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| @@ -243,10 +243,10 @@ void LayoutBlock::styleDidChange(StyleDifference diff,
|
| // It's possible for our border/padding to change, but for the overall logical
|
| // width or height of the block to end up being the same. We keep track of
|
| // this change so in layoutBlock, we can know to set relayoutChildren=true.
|
| - m_widthAvailableToChildrenChanged |=
|
| - oldStyle && needsLayout() &&
|
| - (diff.needsFullLayout() || borderOrPaddingLogicalDimensionChanged(
|
| - *oldStyle, newStyle, LogicalWidth));
|
| + m_widthAvailableToChildrenChanged |= oldStyle && needsLayout() &&
|
| + (diff.needsFullLayout() ||
|
| + borderOrPaddingLogicalDimensionChanged(
|
| + *oldStyle, newStyle, LogicalWidth));
|
| m_heightAvailableToChildrenChanged |= oldStyle && diff.needsFullLayout() &&
|
| needsLayout() &&
|
| borderOrPaddingLogicalDimensionChanged(
|
| @@ -641,11 +641,12 @@ bool LayoutBlock::simplifiedLayout() {
|
| if (posChildNeedsLayout() || needsPositionedMovementLayout() ||
|
| canContainFixedPosObjects)
|
| layoutPositionedObjects(
|
| - false, needsPositionedMovementLayout()
|
| - ? ForcedLayoutAfterContainingBlockMoved
|
| - : (!posChildNeedsLayout() && canContainFixedPosObjects
|
| - ? LayoutOnlyFixedPositionedObjects
|
| - : DefaultLayout));
|
| + false,
|
| + needsPositionedMovementLayout()
|
| + ? ForcedLayoutAfterContainingBlockMoved
|
| + : (!posChildNeedsLayout() && canContainFixedPosObjects
|
| + ? LayoutOnlyFixedPositionedObjects
|
| + : DefaultLayout));
|
|
|
| // Recompute our overflow information.
|
| // FIXME: We could do better here by computing a temporary overflow object
|
| @@ -938,8 +939,9 @@ LayoutBlock* LayoutBlock::blockBeforeWithinSelectionRoot(
|
| LayoutObject* sibling;
|
| do {
|
| sibling = object->previousSibling();
|
| - while (sibling && (!sibling->isLayoutBlock() ||
|
| - toLayoutBlock(sibling)->isSelectionRoot()))
|
| + while (sibling &&
|
| + (!sibling->isLayoutBlock() ||
|
| + toLayoutBlock(sibling)->isSelectionRoot()))
|
| sibling = sibling->previousSibling();
|
|
|
| offset -= LayoutSize(toLayoutBlock(object)->logicalLeft(),
|
| @@ -1208,8 +1210,9 @@ bool LayoutBlock::hitTestChildren(HitTestResult& result,
|
| child->nodeAtPoint(result, locationInContainer, childPoint,
|
| childHitTest)) {
|
| updateHitTestResult(
|
| - result, flipForWritingMode(toLayoutPoint(locationInContainer.point() -
|
| - accumulatedOffset)));
|
| + result,
|
| + flipForWritingMode(
|
| + toLayoutPoint(locationInContainer.point() - accumulatedOffset)));
|
| return true;
|
| }
|
| }
|
| @@ -1419,9 +1422,9 @@ void LayoutBlock::computeIntrinsicLogicalWidths(
|
| if (isTableCell()) {
|
| Length tableCellWidth = toLayoutTableCell(this)->styleOrColLogicalWidth();
|
| if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
|
| - maxLogicalWidth =
|
| - std::max(minLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(
|
| - LayoutUnit(tableCellWidth.value())));
|
| + maxLogicalWidth = std::max(minLogicalWidth,
|
| + adjustContentBoxLogicalWidthForBoxSizing(
|
| + LayoutUnit(tableCellWidth.value())));
|
| }
|
|
|
| int scrollbarWidth = scrollbarLogicalWidth();
|
|
|