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

Unified Diff: Source/core/rendering/RenderButton.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/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderButton.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderButton.h
diff --git a/Source/core/rendering/RenderButton.h b/Source/core/rendering/RenderButton.h
index 952b7d4cbe03fca951bdde95745d390cefcafb8e..0cd43f31b9138696f639a4a283946bfb90ffe627 100644
--- a/Source/core/rendering/RenderButton.h
+++ b/Source/core/rendering/RenderButton.h
@@ -35,13 +35,13 @@ public:
virtual ~RenderButton();
virtual const char* renderName() const override { return "RenderButton"; }
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderButton || RenderFlexibleBox::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderButton || RenderFlexibleBox::isOfType(type); }
virtual bool canBeSelectionLeaf() const override { return node() && node()->hasEditableStyle(); }
virtual bool canCollapseAnonymousBlockChild() const override { return true; }
- virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) override;
- virtual void removeChild(RenderObject*) override;
+ virtual void addChild(LayoutObject* newChild, LayoutObject *beforeChild = 0) override;
+ virtual void removeChild(LayoutObject*) override;
virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
virtual bool createsAnonymousWrapper() const override { return true; }
@@ -52,14 +52,14 @@ public:
virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode) const override;
private:
- virtual void updateAnonymousChildStyle(const RenderObject* child, RenderStyle* childStyle) const override;
+ virtual void updateAnonymousChildStyle(const LayoutObject* child, RenderStyle* childStyle) const override;
virtual bool hasLineIfEmpty() const override { return isHTMLInputElement(node()); }
RenderBlock* m_inner;
};
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderButton, isRenderButton());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderButton, isRenderButton());
} // namespace blink
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderButton.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698