| 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 e29f54a992c0347d86d6de84fad7c9a18707a4a7..79d265ff8ea5831408270115850a47720f16d62f 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -385,8 +385,6 @@ private:
|
|
|
| bool isLayoutBlock() const final { return true; }
|
|
|
| - void makeChildrenNonInline(LayoutObject* insertionPoint = nullptr);
|
| -
|
| virtual void removeLeftoverAnonymousBlock(LayoutBlock* child);
|
|
|
| void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dirtyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); }
|
| @@ -408,8 +406,6 @@ private:
|
|
|
| void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const;
|
|
|
| - void childBecameNonInline(LayoutObject* child) final;
|
| -
|
| bool isSelectionRoot() const;
|
|
|
| public:
|
| @@ -474,10 +470,6 @@ protected:
|
| unsigned m_hasPositionedObjects : 1;
|
| unsigned m_hasPercentHeightDescendants : 1;
|
|
|
| - // LayoutRubyBase objects need to be able to split and merge, moving their children around
|
| - // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
|
| - friend class LayoutRubyBase;
|
| -
|
| // FIXME: This is temporary as we move code that accesses block flow
|
| // member variables out of LayoutBlock and into LayoutBlockFlow.
|
| friend class LayoutBlockFlow;
|
|
|