Changeset 109414 in webkit

Timestamp:

Mar 1, 2012, 1:50:18 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 108194
BUG=114924
Review URL: ​https://chromiumcodereview.appspot.com/9568037

Location:

branches/chromium/963

Files:

• LayoutTests/fast/table/table-split-inside-table-expected.txt (copied) (copied from trunk/LayoutTests/fast/table/table-split-inside-table-expected.txt )
• LayoutTests/fast/table/table-split-inside-table.html (copied) (copied from trunk/LayoutTests/fast/table/table-split-inside-table.html )
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

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

@@ -654 +654 @@
     ASSERT(beforeChild->isTablePart());
 
-    while (beforeChild->parent() != this && !beforeChild->isTable()) {
+    while (beforeChild->parent() != this) {
         RenderObject* tablePartToSplit = beforeChild->parent();
+        if (!tablePartToSplit->isTablePart() && !tablePartToSplit->isTable())
+            break;
         if (tablePartToSplit->firstChild() != beforeChild) {
             // Get our table container.
@@ -663 +665 @@
             RenderTable* table = toRenderTable(curr);
 
-            // Create an anonymous table container next to our table container. 
+            // Create an anonymous table container next to our table container.
             RenderBlock* parentBlock = toRenderBlock(table->parent());
             RenderTable* postTable = parentBlock->createAnonymousTable();