Changeset 109399 in webkit

Timestamp:

Mar 1, 2012, 12:49:14 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 107987
BUG=113799
Review URL: ​https://chromiumcodereview.appspot.com/9569026

Location:

branches/chromium/963

Files:

• LayoutTests/fast/multicol/span/table-multi-column-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/multicol/span/table-multi-column-crash-expected.txt )
• LayoutTests/fast/multicol/span/table-multi-column-crash.html (copied) (copied from trunk/LayoutTests/fast/multicol/span/table-multi-column-crash.html )
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

branches/chromium/963/Source/WebCore/rendering/RenderBlock.cpp

@@ -428 +428 @@
         if (!curr->isRenderBlock() || curr->isFloatingOrPositioned() || curr->isTableCell() || curr->isRoot() || curr->isRenderView() || curr->hasOverflowClip()
             || curr->isInlineBlockOrInlineTable())
+            return 0;
+
+        // FIXME: Table manages its own table parts, most of which are RenderBoxes.
+        // Multi-column code cannot handle splitting the flow in table. Disabling it
+        // to prevent crashes.
+        if (curr->isTable())
             return 0;