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

Unified Diff: trunk/Source/core/rendering/RenderBlock.cpp

Issue 104593014: Revert 164125 "ASSERTION FAILED: !object || object->isTable()" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 12 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: trunk/Source/core/rendering/RenderBlock.cpp
===================================================================
--- trunk/Source/core/rendering/RenderBlock.cpp (revision 164404)
+++ trunk/Source/core/rendering/RenderBlock.cpp (working copy)
@@ -707,10 +707,6 @@
void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild)
{
- // FIXME: We should NEVER hit this code path for tables as they should go through RenderTable::addChild
- // to add the appropriate anonymous wrappers. Unfortunately a lot of callers call this method directly
- // (bypassing the virtual addChild), which means we can't enforce this before cleaning them up.
-
if (beforeChild && beforeChild->parent() != this) {
RenderObject* beforeChildContainer = beforeChild->parent();
while (beforeChildContainer->parent() != this)
@@ -811,19 +807,13 @@
if (newChild->isInline()) {
// No suitable existing anonymous box - create a new one.
RenderBlock* newBox = createAnonymousBlock();
- if (isTable())
- toRenderTable(this)->addChild(newBox, beforeChild);
- else
- RenderBox::addChild(newBox, beforeChild);
+ RenderBox::addChild(newBox, beforeChild);
newBox->addChild(newChild);
return;
}
}
- if (isTable())
- toRenderTable(this)->addChild(newChild, beforeChild);
- else
- RenderBox::addChild(newChild, beforeChild);
+ RenderBox::addChild(newChild, beforeChild);
if (madeBoxesNonInline && parent() && isAnonymousBlock() && parent()->isRenderBlock())
toRenderBlock(parent())->removeLeftoverAnonymousBlock(this);

Powered by Google App Engine
This is Rietveld 408576698