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

Unified Diff: Source/core/rendering/RenderFrameSet.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/rendering/RenderFrame.h ('k') | Source/core/rendering/RenderFrameSet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFrameSet.h
diff --git a/Source/core/rendering/RenderFrameSet.h b/Source/core/rendering/RenderFrameSet.h
index 5dd70c3a3d7d5f309f6b336d9f761b4017a80c91..35c3e3860cb3a4e222f72b021af6b048a63ea9df 100644
--- a/Source/core/rendering/RenderFrameSet.h
+++ b/Source/core/rendering/RenderFrameSet.h
@@ -58,15 +58,15 @@ public:
RenderFrameSet(HTMLFrameSetElement*);
virtual ~RenderFrameSet();
- RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
- RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
+ LayoutObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
+ LayoutObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
// If you have a RenderFrameSet, use firstChild or lastChild instead.
void slowFirstChild() const = delete;
void slowLastChild() const = delete;
- const RenderObjectChildList* children() const { return &m_children; }
- RenderObjectChildList* children() { return &m_children; }
+ const LayoutObjectChildList* children() const { return &m_children; }
+ LayoutObjectChildList* children() { return &m_children; }
FrameEdgeInfo edgeInfo() const;
@@ -98,16 +98,16 @@ public:
private:
static const int noSplit = -1;
- virtual RenderObjectChildList* virtualChildren() override { return children(); }
- virtual const RenderObjectChildList* virtualChildren() const override { return children(); }
+ virtual LayoutObjectChildList* virtualChildren() override { return children(); }
+ virtual const LayoutObjectChildList* virtualChildren() const override { return children(); }
virtual const char* renderName() const override { return "RenderFrameSet"; }
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectFrameSet || RenderBox::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectFrameSet || RenderBox::isOfType(type); }
virtual void layout() override;
virtual void paint(const PaintInfo&, const LayoutPoint&) override;
virtual void computePreferredLogicalWidths() override;
- virtual bool isChildAllowed(RenderObject*, const RenderStyle&) const override;
+ virtual bool isChildAllowed(LayoutObject*, const RenderStyle&) const override;
virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
void setIsResizing(bool);
@@ -123,7 +123,7 @@ private:
void startResizing(GridAxis&, int position);
void continueResizing(GridAxis&, int position);
- RenderObjectChildList m_children;
+ LayoutObjectChildList m_children;
GridAxis m_rows;
GridAxis m_cols;
@@ -132,7 +132,7 @@ private:
bool m_isChildResizing;
};
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet());
} // namespace blink
« no previous file with comments | « Source/core/rendering/RenderFrame.h ('k') | Source/core/rendering/RenderFrameSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698