| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index ffefbedd7d606bb09bb58a96a38c8776d9d7a41f..9349b59fb100915b4cd02a563d29b53359edb750 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -324,6 +324,13 @@ bool RenderObject::requiresAnonymousTableWrappers(const RenderObject* newChild)
|
| return false;
|
| }
|
|
|
| +bool RenderObject::isValidColumnSpanAll() const
|
| +{
|
| + ASSERT(style()->columnSpan() == ColumnSpanAll);
|
| + RenderFlowThread* flowThread = flowThreadContainingBlock();
|
| + return flowThread && flowThread->isColumnSpanner(this);
|
| +}
|
| +
|
| void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild)
|
| {
|
| ASSERT(isAllowedToModifyRenderTreeStructure(document()));
|
| @@ -2391,6 +2398,9 @@ void RenderObject::insertedIntoTree()
|
|
|
| if (!isFloating() && parent()->childrenInline())
|
| parent()->dirtyLinesFromChangedChild(this);
|
| +
|
| + if (RenderFlowThread* flowThread = parent()->flowThreadContainingBlock())
|
| + flowThread->flowThreadDescendantInserted(this);
|
| }
|
|
|
| void RenderObject::willBeRemovedFromTree()
|
| @@ -2441,6 +2451,8 @@ void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF
|
| child->removeFromRenderFlowThreadRecursive(renderFlowThread);
|
| }
|
|
|
| + if (renderFlowThread && renderFlowThread != this)
|
| + renderFlowThread->flowThreadDescendantWillBeRemoved(this);
|
| setFlowThreadState(NotInsideFlowThread);
|
| }
|
|
|
|
|