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

Unified Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 1070233002: Remove dead code around anonymous renderers. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 | « sky/engine/core/dom/PositionIterator.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlock.cpp
diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
index f70c0888fef056c9c6446f6d6f26c336603b1825..acb97416f6383876d4b6debb29c4997c4f16a6e8 100644
--- a/sky/engine/core/rendering/RenderBlock.cpp
+++ b/sky/engine/core/rendering/RenderBlock.cpp
@@ -139,18 +139,9 @@ void RenderBlock::willBeDestroyed()
// is notified of DOM mutations.
if (isSelectionBorder())
view()->clearSelection();
-
- // If we are an anonymous block, then our line boxes might have children
- // that will outlast this block. In the non-anonymous block case those
- // children will be destroyed by the time we return from this function.
- if (isAnonymousBlock()) {
- for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) {
- while (InlineBox* childBox = box->firstChild())
- childBox->remove();
- }
- }
- } else if (parent())
+ } else if (parent()) {
parent()->dirtyLinesFromChangedChild(this);
+ }
}
m_lineBoxes.deleteLineBoxes();
@@ -478,7 +469,7 @@ bool RenderBlock::shouldPaintSelectionGaps() const
bool RenderBlock::isSelectionRoot() const
{
- ASSERT(node() || isAnonymous());
+ ASSERT(node());
if (node() && node()->parentNode() == document())
return true;
@@ -832,7 +823,6 @@ TrackedRendererListHashSet* RenderBlock::positionedObjects() const
void RenderBlock::insertPositionedObject(RenderBox* o)
{
- ASSERT(!isAnonymousBlock());
insertIntoTrackedRendererMaps(o, gPositionedDescendantsMap, gPositionedContainerMap);
}
@@ -1577,10 +1567,6 @@ const char* RenderBlock::renderName() const
return "RenderBlock (inline-block)";
if (isOutOfFlowPositioned())
return "RenderBlock (positioned)";
- if (isAnonymousBlock())
- return "RenderBlock (anonymous)";
- if (isAnonymous())
- return "RenderBlock (generated)";
return "RenderBlock";
}
« no previous file with comments | « sky/engine/core/dom/PositionIterator.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698