| Index: Source/core/layout/LayoutMultiColumnFlowThread.h
|
| diff --git a/Source/core/layout/LayoutMultiColumnFlowThread.h b/Source/core/layout/LayoutMultiColumnFlowThread.h
|
| index 09149d9807c89d6974171719b3504d7b1e6a4b33..4cf995a494c428b61a3f1d4ae2984393cb3c00b5 100644
|
| --- a/Source/core/layout/LayoutMultiColumnFlowThread.h
|
| +++ b/Source/core/layout/LayoutMultiColumnFlowThread.h
|
| @@ -178,6 +178,9 @@ public:
|
|
|
| void columnRuleStyleDidChange();
|
|
|
| + // Remove the spanner placeholder and return true if the specified object is no longer a valid spanner.
|
| + bool removeSpannerPlaceholderIfNoLongerValid(LayoutBox* spannerObjectInFlowThread);
|
| +
|
| virtual const char* name() const override { return "LayoutMultiColumnFlowThread"; }
|
|
|
| protected:
|
| @@ -196,8 +199,8 @@ private:
|
| virtual void addColumnSetToThread(LayoutMultiColumnSet*) override;
|
| virtual void willBeRemovedFromTree() override;
|
| virtual LayoutUnit skipColumnSpanner(LayoutBox*, LayoutUnit logicalTopInFlowThread) override;
|
| - virtual void flowThreadDescendantWasInserted(LayoutObject*) override;
|
| - virtual void flowThreadDescendantWillBeRemoved(LayoutObject*) override;
|
| + virtual void flowThreadDescendantWasInserted(LayoutObject*) final;
|
| + virtual void flowThreadDescendantWillBeRemoved(LayoutObject*) final;
|
| virtual void flowThreadDescendantStyleWillChange(LayoutObject*, StyleDifference, const ComputedStyle& newStyle) override;
|
| virtual void flowThreadDescendantStyleDidChange(LayoutObject*, StyleDifference, const ComputedStyle& oldStyle) override;
|
| virtual void computePreferredLogicalWidths() override;
|
|
|