| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| index cb2ddbe16713106f5bbe855a283726a29aa28536..e43ab81f0e13140c0dc0063725f3327903ab6ffd 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| @@ -415,6 +415,7 @@ void LayoutBlockFlow::layoutBlock(bool relayoutChildren)
|
| m_isSelfCollapsing = checkIfIsSelfCollapsingBlock();
|
| }
|
|
|
| +DISABLE_CFI_PERF
|
| inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &pageLogicalHeight, SubtreeLayoutScope& layoutScope)
|
| {
|
| LayoutUnit oldLeft = logicalLeft();
|
| @@ -564,6 +565,7 @@ void LayoutBlockFlow::addLowestFloatFromChildren(LayoutBlockFlow* block)
|
| newFloatingObject->setIsLowestNonOverhangingFloatInChild(true);
|
| }
|
|
|
| +DISABLE_CFI_PERF
|
| void LayoutBlockFlow::determineLogicalLeftPositionForChild(LayoutBox& child)
|
| {
|
| LayoutUnit startPosition = borderStart() + paddingStart();
|
| @@ -1019,6 +1021,7 @@ LayoutUnit LayoutBlockFlow::adjustForUnsplittableChild(LayoutBox& child, LayoutU
|
| return logicalOffset + paginationStrut;
|
| }
|
|
|
| +DISABLE_CFI_PERF
|
| void LayoutBlockFlow::rebuildFloatsFromIntruding()
|
| {
|
| if (m_floatingObjects)
|
| @@ -1569,6 +1572,7 @@ void LayoutBlockFlow::setCollapsedBottomMargin(const MarginInfo& marginInfo)
|
| }
|
| }
|
|
|
| +DISABLE_CFI_PERF
|
| void LayoutBlockFlow::marginBeforeEstimateForChild(LayoutBox& child, LayoutUnit& positiveMarginBefore, LayoutUnit& negativeMarginBefore, bool& discardMarginBefore) const
|
| {
|
| // Give up if in quirks mode and we're a body/table cell and the top margin of the child box is quirky.
|
| @@ -2254,6 +2258,7 @@ void LayoutBlockFlow::styleWillChange(StyleDifference diff, const ComputedStyle&
|
| LayoutBlock::styleWillChange(diff, newStyle);
|
| }
|
|
|
| +DISABLE_CFI_PERF
|
| void LayoutBlockFlow::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
|
| {
|
| bool hadSelfPaintingLayer = hasSelfPaintingLayer();
|
|
|