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

Unified Diff: Source/core/dom/RenderTreeBuilder.h

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/Range.cpp ('k') | Source/core/dom/RenderTreeBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/RenderTreeBuilder.h
diff --git a/Source/core/dom/RenderTreeBuilder.h b/Source/core/dom/RenderTreeBuilder.h
index 8661c9cbed6f82cbe5ce9c4c5fe3fb8a398401c4..bcd055e5f0cfe07cff29a2b17fa9df8514dcc5d9 100644
--- a/Source/core/dom/RenderTreeBuilder.h
+++ b/Source/core/dom/RenderTreeBuilder.h
@@ -31,19 +31,19 @@
#include "core/dom/Node.h"
#include "core/dom/NodeRenderingTraversal.h"
#include "core/dom/Text.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
#include "wtf/RefPtr.h"
namespace blink {
-class RenderObject;
+class LayoutObject;
class RenderStyle;
template <typename NodeType>
class RenderTreeBuilder {
STACK_ALLOCATED();
protected:
- RenderTreeBuilder(NodeType& node, RenderObject* renderingParent)
+ RenderTreeBuilder(NodeType& node, LayoutObject* renderingParent)
: m_node(node)
, m_renderingParent(renderingParent)
{
@@ -58,9 +58,9 @@ protected:
// which does an updateLayoutIgnorePendingStylesheets.
}
- RenderObject* parentRenderer() const { return m_renderingParent; }
+ LayoutObject* parentRenderer() const { return m_renderingParent; }
- RenderObject* nextRenderer() const
+ LayoutObject* nextRenderer() const
{
ASSERT(m_renderingParent);
@@ -72,7 +72,7 @@ protected:
}
RawPtrWillBeMember<NodeType> m_node;
- RawPtrWillBeMember<RenderObject> m_renderingParent;
+ RawPtrWillBeMember<LayoutObject> m_renderingParent;
};
class RenderTreeBuilderForElement : public RenderTreeBuilder<Element> {
@@ -86,8 +86,8 @@ public:
}
private:
- RenderObject* parentRenderer() const;
- RenderObject* nextRenderer() const;
+ LayoutObject* parentRenderer() const;
+ LayoutObject* nextRenderer() const;
bool shouldCreateRenderer() const;
RenderStyle& style() const;
void createRenderer();
@@ -97,7 +97,7 @@ private:
class RenderTreeBuilderForText : public RenderTreeBuilder<Text> {
public:
- RenderTreeBuilderForText(Text& text, RenderObject* renderingParent)
+ RenderTreeBuilderForText(Text& text, LayoutObject* renderingParent)
: RenderTreeBuilder(text, renderingParent) { }
void createRenderer();
« no previous file with comments | « Source/core/dom/Range.cpp ('k') | Source/core/dom/RenderTreeBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698