Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1381)

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 584033002: [New Multicolumn] Add support for column-span:all (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698