[New Multicolumn] Out-of-flow objects don't establish column sets.

Source/core/layout/LayoutMultiColumnFlowThread.cpp

Index: Source/core/layout/LayoutMultiColumnFlowThread.cpp
diff --git a/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
index b0c841ac62d4ceb5eb374af1c2908908239f6f26..97762bf2dc7da5ec9768285d0b560e84e4c76e7d 100644
--- a/Source/core/layout/LayoutMultiColumnFlowThread.cpp
+++ b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
@@ -532,6 +532,21 @@ void LayoutMultiColumnFlowThread::flowThreadDescendantWasInserted(LayoutObject*
             continue;
         }
         // This layoutObject is regular column content (i.e. not a spanner). Create a set if necessary.
+        while (objectAfterSubtree) {
+            // First skip objects that do not have this flow thread in their containing block

[dsinclair, 2015/04/29 13:31:19]

This comment is a bit confusing given it's placement. I'd expect the next if()
to be skipping things, but, in fact it's dealing with in-flow objects which did
create a column set. It might be better as something like:


Walk through the children and find the first child which is either in-flow or
has this flow thread as its containing block flow thread.

(Assuming I'm reading the below correctly?)

[mstensho (USE GERRIT), 2015/04/29 13:52:21]

That works, except that it's siblings (or aunts), not children. :)

Done.

+            // chain. They don't establish column sets.
+            if (!objectAfterSubtree->isOutOfFlowPositioned()) {
+                // In-flow objects are always part of the flow thread (unless it's a spanner - but
+                // we'll deal with that further below).
+                break;
+            }
+            if (objectAfterSubtree->containingBlock()->flowThreadContainingBlock() == this) {
+                // This out-of-flow object is still part of the flow thread, because its containing
+                // block (probably relatively positioned) is part of the flow thread.
+                break;
+            }
+            objectAfterSubtree = objectAfterSubtree->nextInPreOrderAfterChildren(this);
+        }
         if (objectAfterSubtree) {
             if (LayoutMultiColumnSpannerPlaceholder* placeholder = objectAfterSubtree->spannerPlaceholder()) {
                 // If inserted right before a spanner, we need to make sure that there's a set for us there.