| Index: third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| index 073fa932968c2c09554ab31cc087a1107256f8d3..83b7b3c423b67e800faaa45ce144b47078c8d39a 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -405,8 +405,6 @@ private:
|
|
|
| void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObject* beforeChild) override;
|
|
|
| - bool isSelfCollapsingBlock() const override;
|
| -
|
| TrackedLayoutBoxListHashSet* positionedObjectsInternal() const;
|
| TrackedLayoutBoxListHashSet* percentHeightDescendantsInternal() const;
|
|
|
| @@ -503,7 +501,7 @@ protected:
|
| unsigned m_hasMarkupTruncation : 1;
|
| unsigned m_widthAvailableToChildrenChanged : 1;
|
| unsigned m_heightAvailableToChildrenChanged : 1;
|
| - mutable unsigned m_hasOnlySelfCollapsingChildren : 1;
|
| + unsigned m_isSelfCollapsing : 1; // True if margin-before and margin-after are adjoining.
|
| mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1;
|
|
|
| unsigned m_hasPositionedObjects : 1;
|
|
|