| Index: third_party/WebKit/Source/core/layout/LayoutBox.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| index 06152bea1a748b6d3f5d32ed05d27f387d798166..c8603a8de7b50f07aeed77006727d34c71ee05ae 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| @@ -202,7 +202,6 @@ public:
|
|
|
| // Use this with caution! No type checking is done!
|
| LayoutBox* firstChildBox() const;
|
| - LayoutBox* firstInFlowChildBox() const;
|
| LayoutBox* lastChildBox() const;
|
|
|
| int pixelSnappedWidth() const { return m_frameRect.pixelSnappedWidth(); }
|
| @@ -1028,6 +1027,7 @@ protected:
|
| static void computeInlineStaticDistance(Length& logicalLeft, Length& logicalRight, const LayoutBox* child, const LayoutBoxModelObject* containerBlock, LayoutUnit containerLogicalWidth);
|
| static void computeLogicalLeftPositionedOffset(LayoutUnit& logicalLeftPos, const LayoutBox* child, LayoutUnit logicalWidthValue, const LayoutBoxModelObject* containerBlock, LayoutUnit containerLogicalWidth);
|
| static void computeLogicalTopPositionedOffset(LayoutUnit& logicalTopPos, const LayoutBox* child, LayoutUnit logicalHeightValue, const LayoutBoxModelObject* containerBlock, LayoutUnit containerLogicalHeight);
|
| + bool skipContainingBlockForPercentHeightCalculation(const LayoutBox* containingBlock) const;
|
|
|
| private:
|
| void updateShapeOutsideInfoAfterStyleChange(const ComputedStyle&, const ComputedStyle* oldStyle);
|
| @@ -1040,7 +1040,6 @@ private:
|
| LayoutUnit shrinkToFitLogicalWidth(LayoutUnit availableLogicalWidth, LayoutUnit bordersPlusPadding) const;
|
|
|
| bool stretchesToViewportInQuirksMode() const;
|
| - bool skipContainingBlockForPercentHeightCalculation(const LayoutBox* containingBlock) const;
|
|
|
| virtual void computePositionedLogicalHeight(LogicalExtentComputedValues&) const;
|
| void computePositionedLogicalWidthUsing(SizeType, Length logicalWidth, const LayoutBoxModelObject* containerBlock, TextDirection containerDirection,
|
| @@ -1175,14 +1174,6 @@ inline LayoutBox* LayoutBox::firstChildBox() const
|
| return toLayoutBox(slowFirstChild());
|
| }
|
|
|
| -inline LayoutBox* LayoutBox::firstInFlowChildBox() const
|
| -{
|
| - LayoutBox* child = firstChildBox();
|
| - while (child && child->isOutOfFlowPositioned())
|
| - child = child->nextSiblingBox();
|
| - return child;
|
| -}
|
| -
|
| inline LayoutBox* LayoutBox::lastChildBox() const
|
| {
|
| return toLayoutBox(slowLastChild());
|
|
|