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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | « Source/core/dom/NodeRenderingTraversal.h ('k') | Source/core/dom/Position.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/NodeRenderingTraversal.cpp
diff --git a/Source/core/dom/NodeRenderingTraversal.cpp b/Source/core/dom/NodeRenderingTraversal.cpp
index e8b91c16801b979c81736d5dd9fdee7c642e1a43..efa8ce42cacbe9696a48cddefabaec6b80c7b039 100644
--- a/Source/core/dom/NodeRenderingTraversal.cpp
+++ b/Source/core/dom/NodeRenderingTraversal.cpp
@@ -30,13 +30,13 @@
#include "core/HTMLNames.h"
#include "core/dom/PseudoElement.h"
#include "core/dom/shadow/ComposedTreeTraversal.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
namespace blink {
namespace NodeRenderingTraversal {
-static bool isRendererReparented(const RenderObject* renderer)
+static bool isRendererReparented(const LayoutObject* renderer)
{
if (!renderer->node()->isElementNode())
return false;
@@ -225,27 +225,27 @@ Node* next(const Node& node, const Node* stayWithin)
return nextSkippingChildren(node, stayWithin);
}
-RenderObject* nextSiblingRenderer(const Node& node)
+LayoutObject* nextSiblingRenderer(const Node& node)
{
for (Node* sibling = NodeRenderingTraversal::nextSibling(node); sibling; sibling = NodeRenderingTraversal::nextSibling(*sibling)) {
- RenderObject* renderer = sibling->renderer();
+ LayoutObject* renderer = sibling->renderer();
if (renderer && !isRendererReparented(renderer))
return renderer;
}
return 0;
}
-RenderObject* previousSiblingRenderer(const Node& node)
+LayoutObject* previousSiblingRenderer(const Node& node)
{
for (Node* sibling = NodeRenderingTraversal::previousSibling(node); sibling; sibling = NodeRenderingTraversal::previousSibling(*sibling)) {
- RenderObject* renderer = sibling->renderer();
+ LayoutObject* renderer = sibling->renderer();
if (renderer && !isRendererReparented(renderer))
return renderer;
}
return 0;
}
-RenderObject* nextInTopLayer(const Element& element)
+LayoutObject* nextInTopLayer(const Element& element)
{
if (!element.isInTopLayer())
return 0;
@@ -253,7 +253,7 @@ RenderObject* nextInTopLayer(const Element& element)
size_t position = topLayerElements.find(&element);
ASSERT(position != kNotFound);
for (size_t i = position + 1; i < topLayerElements.size(); ++i) {
- if (RenderObject* renderer = topLayerElements[i]->renderer())
+ if (LayoutObject* renderer = topLayerElements[i]->renderer())
return renderer;
}
return 0;
« no previous file with comments | « Source/core/dom/NodeRenderingTraversal.h ('k') | Source/core/dom/Position.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698