Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index 8e69a50b5ae9e71bde754b370f8124534d3e483d..47ac9fa8bf1f2b8c41b43d58bb44a3d2bf9b5937 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -336,6 +336,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())); |
@@ -2749,6 +2756,9 @@ void RenderObject::insertedIntoTree() |
if (!isFloating() && parent()->childrenInline()) |
parent()->dirtyLinesFromChangedChild(this); |
+ |
+ if (RenderFlowThread* flowThread = parent()->flowThreadContainingBlock()) |
+ flowThread->flowThreadDescendantInserted(this); |
} |
void RenderObject::willBeRemovedFromTree() |
@@ -2799,6 +2809,8 @@ void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF |
child->removeFromRenderFlowThreadRecursive(renderFlowThread); |
} |
+ if (renderFlowThread && renderFlowThread != this) |
+ renderFlowThread->flowThreadDescendantWillBeRemoved(this); |
setFlowThreadState(NotInsideFlowThread); |
} |