| 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();
|
|
|