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

Unified Diff: Source/core/dom/NodeRenderingContext.cpp

Issue 14467003: Remove ENABLE_DIALOG_ELEMENT (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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
Index: Source/core/dom/NodeRenderingContext.cpp
diff --git a/Source/core/dom/NodeRenderingContext.cpp b/Source/core/dom/NodeRenderingContext.cpp
index b5fa15ba3c688b9af157d360bab145ac4844fe51..d2cc826e3f901716626efd72492a7fcc70976fb5 100644
--- a/Source/core/dom/NodeRenderingContext.cpp
+++ b/Source/core/dom/NodeRenderingContext.cpp
@@ -79,10 +79,8 @@ static bool isRendererReparented(const RenderObject* renderer)
return false;
if (renderer->style() && !renderer->style()->flowThread().isEmpty())
return true;
-#if ENABLE(DIALOG_ELEMENT)
if (toElement(renderer->node())->isInTopLayer())
return true;
-#endif
return false;
}
@@ -91,7 +89,6 @@ RenderObject* NodeRenderingContext::nextRenderer() const
if (RenderObject* renderer = m_node->renderer())
return renderer->nextSibling();
-#if ENABLE(DIALOG_ELEMENT)
Element* element = m_node->isElementNode() ? toElement(m_node) : 0;
if (element && element->isInTopLayer()) {
const Vector<RefPtr<Element> >& topLayerElements = element->document()->topLayerElements();
@@ -103,7 +100,6 @@ RenderObject* NodeRenderingContext::nextRenderer() const
}
return 0;
}
-#endif
if (m_parentFlowRenderer)
return m_parentFlowRenderer->nextRendererForNode(m_node);
@@ -127,12 +123,10 @@ RenderObject* NodeRenderingContext::previousRenderer() const
if (RenderObject* renderer = m_node->renderer())
return renderer->previousSibling();
-#if ENABLE(DIALOG_ELEMENT)
// FIXME: This doesn't work correctly for things in the top layer that are
// display: none. We'd need to duplicate the logic in nextRenderer, but since
// nothing needs that yet just assert.
ASSERT(!m_node->isElementNode() || !toElement(m_node)->isInTopLayer());
-#endif
if (m_parentFlowRenderer)
return m_parentFlowRenderer->previousRendererForNode(m_node);
@@ -153,7 +147,6 @@ RenderObject* NodeRenderingContext::parentRenderer() const
if (RenderObject* renderer = m_node->renderer())
return renderer->parent();
-#if ENABLE(DIALOG_ELEMENT)
if (m_node->isElementNode() && toElement(m_node)->isInTopLayer()) {
// The parent renderer of top layer elements is the RenderView, but only
// if the normal parent would have had a renderer.
@@ -165,7 +158,6 @@ RenderObject* NodeRenderingContext::parentRenderer() const
return 0;
return m_node->document()->renderView();
}
-#endif
if (m_parentFlowRenderer)
return m_parentFlowRenderer;

Powered by Google App Engine
This is Rietveld 408576698