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

Unified Diff: Source/WebCore/rendering/RenderBlock.cpp

Issue 9562027: Merge 108194 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 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
« no previous file with comments | « LayoutTests/fast/table/table-split-inside-table-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderBlock.cpp
===================================================================
--- Source/WebCore/rendering/RenderBlock.cpp (revision 109414)
+++ Source/WebCore/rendering/RenderBlock.cpp (working copy)
@@ -659,8 +659,10 @@
{
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.
RenderObject* curr = tablePartToSplit;
@@ -668,7 +670,7 @@
curr = curr->parent();
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();
parentBlock->children()->insertChildNode(parentBlock, postTable, table->nextSibling());
« no previous file with comments | « LayoutTests/fast/table/table-split-inside-table-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698