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

Unified Diff: Source/core/rendering/svg/RenderSVGText.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/RenderSVGTSpan.cpp ('k') | Source/core/rendering/svg/RenderSVGText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGText.h
diff --git a/Source/core/rendering/svg/RenderSVGText.h b/Source/core/rendering/svg/RenderSVGText.h
index b5c4b4a73c807124436f5169027ed5ee51740202..3e2075ac87aa9dd19c0746d1a01d12b02a1fd2b6 100644
--- a/Source/core/rendering/svg/RenderSVGText.h
+++ b/Source/core/rendering/svg/RenderSVGText.h
@@ -37,21 +37,21 @@ public:
explicit RenderSVGText(SVGTextElement*);
virtual ~RenderSVGText();
- virtual bool isChildAllowed(RenderObject*, const RenderStyle&) const override;
+ virtual bool isChildAllowed(LayoutObject*, const RenderStyle&) const override;
void setNeedsPositioningValuesUpdate() { m_needsPositioningValuesUpdate = true; }
virtual void setNeedsTransformUpdate() override { m_needsTransformUpdate = true; }
void setNeedsTextMetricsUpdate() { m_needsTextMetricsUpdate = true; }
virtual FloatRect paintInvalidationRectInLocalCoordinates() const override;
- static RenderSVGText* locateRenderSVGTextAncestor(RenderObject*);
- static const RenderSVGText* locateRenderSVGTextAncestor(const RenderObject*);
+ static RenderSVGText* locateRenderSVGTextAncestor(LayoutObject*);
+ static const RenderSVGText* locateRenderSVGTextAncestor(const LayoutObject*);
bool needsReordering() const { return m_needsReordering; }
Vector<SVGTextLayoutAttributes*>& layoutAttributes() { return m_layoutAttributes; }
- void subtreeChildWasAdded(RenderObject*);
- void subtreeChildWillBeRemoved(RenderObject*, Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes);
+ void subtreeChildWasAdded(LayoutObject*);
+ void subtreeChildWillBeRemoved(LayoutObject*, Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes);
void subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes);
void subtreeStyleDidChange();
void subtreeTextDidChange(RenderSVGInlineText*);
@@ -60,7 +60,7 @@ public:
private:
virtual const char* renderName() const override { return "RenderSVGText"; }
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGText || RenderSVGBlock::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVGText || RenderSVGBlock::isOfType(type); }
virtual void paint(const PaintInfo&, const LayoutPoint&) override;
virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override;
@@ -70,8 +70,8 @@ private:
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
- virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
- virtual void removeChild(RenderObject*) override;
+ virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = 0) override;
+ virtual void removeChild(LayoutObject*) override;
virtual void willBeDestroyed() override;
virtual FloatRect objectBoundingBox() const override { return frameRect(); }
@@ -89,7 +89,7 @@ private:
Vector<SVGTextLayoutAttributes*> m_layoutAttributes;
};
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText());
}
« no previous file with comments | « Source/core/rendering/svg/RenderSVGTSpan.cpp ('k') | Source/core/rendering/svg/RenderSVGText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698