| Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| index f61090f4c32613bfdc8f7f456ef4c972f8f8a64e..970ba9255395bc29420a1b99c817028270dc17d4 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h
|
| @@ -325,7 +325,7 @@ protected:
|
|
|
| LayoutRect localCaretRectForEmptyElement(LayoutUnit width, LayoutUnit textIndentOffset);
|
|
|
| - bool hasAutoHeightOrContainingBlockWithAutoHeight() const;
|
| + bool hasAutoHeightOrContainingBlockWithAutoHeight(bool checkingContainingBlock = false) const;
|
| LayoutBlock* containingBlockForAutoHeightDetection(Length logicalHeight) const;
|
|
|
| void addOutlineRectsForNormalChildren(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, IncludeBlockVisualOverflowOrNot) const;
|
|
|