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

Unified Diff: Source/core/rendering/svg/RenderSVGContainer.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/svg/RenderSVGBlock.cpp ('k') | Source/core/rendering/svg/RenderSVGContainer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGContainer.h
diff --git a/Source/core/rendering/svg/RenderSVGContainer.h b/Source/core/rendering/svg/RenderSVGContainer.h
index b5edf8e0b9ae0083cf74c72d8469f3c2d5a79e49..56528843905c5eed4eab2ef35b21380dc4363e22 100644
--- a/Source/core/rendering/svg/RenderSVGContainer.h
+++ b/Source/core/rendering/svg/RenderSVGContainer.h
@@ -38,8 +38,8 @@ public:
void slowFirstChild() const = delete;
void slowLastChild() const = delete;
- 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(); }
virtual void paint(const PaintInfo&, const LayoutPoint&) override;
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
@@ -51,16 +51,16 @@ public:
virtual bool hasNonIsolatedBlendingDescendants() const override final;
protected:
- virtual RenderObjectChildList* virtualChildren() override final { return children(); }
- virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
+ virtual LayoutObjectChildList* virtualChildren() override final { return children(); }
+ virtual const LayoutObjectChildList* virtualChildren() const override final { return children(); }
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGContainer || RenderSVGModelObject::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVGContainer || RenderSVGModelObject::isOfType(type); }
virtual const char* renderName() const override { return "RenderSVGContainer"; }
virtual void layout() override;
- virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
- virtual void removeChild(RenderObject*) override final;
+ virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = 0) override final;
+ virtual void removeChild(LayoutObject*) override final;
virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset) const override final;
virtual FloatRect objectBoundingBox() const override final { return m_objectBoundingBox; }
@@ -82,10 +82,10 @@ protected:
virtual void descendantIsolationRequirementsChanged(DescendantIsolationState) override final;
private:
- const RenderObjectChildList* children() const { return &m_children; }
- RenderObjectChildList* children() { return &m_children; }
+ const LayoutObjectChildList* children() const { return &m_children; }
+ LayoutObjectChildList* children() { return &m_children; }
- RenderObjectChildList m_children;
+ LayoutObjectChildList m_children;
FloatRect m_objectBoundingBox;
FloatRect m_strokeBoundingBox;
bool m_objectBoundingBoxValid;
@@ -94,7 +94,7 @@ private:
mutable bool m_hasNonIsolatedBlendingDescendantsDirty : 1;
};
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGContainer, isSVGContainer());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderSVGContainer, isSVGContainer());
} // namespace blink
« no previous file with comments | « Source/core/rendering/svg/RenderSVGBlock.cpp ('k') | Source/core/rendering/svg/RenderSVGContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698