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

Unified Diff: Source/core/layout/LayoutRubyBase.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/layout/LayoutRuby.cpp ('k') | Source/core/layout/LayoutRubyBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutRubyBase.h
diff --git a/Source/core/layout/LayoutRubyBase.h b/Source/core/layout/LayoutRubyBase.h
index 0c42428cfa9614c5c012693b2441194703808ff0..d9ddf3e9899916d2f3459df2dd2a4729af9b62c7 100644
--- a/Source/core/layout/LayoutRubyBase.h
+++ b/Source/core/layout/LayoutRubyBase.h
@@ -45,9 +45,9 @@ public:
virtual const char* renderName() const override { return "LayoutRubyBase (anonymous)"; }
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRubyBase || RenderBlockFlow::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRubyBase || RenderBlockFlow::isOfType(type); }
- virtual bool isChildAllowed(RenderObject*, const RenderStyle&) const override;
+ virtual bool isChildAllowed(LayoutObject*, const RenderStyle&) const override;
private:
LayoutRubyBase();
@@ -55,9 +55,9 @@ private:
virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const override;
virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const override;
- void moveChildren(LayoutRubyBase* toBase, RenderObject* beforeChild = 0);
- void moveInlineChildren(LayoutRubyBase* toBase, RenderObject* beforeChild = 0);
- void moveBlockChildren(LayoutRubyBase* toBase, RenderObject* beforeChild = 0);
+ void moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = 0);
+ void moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = 0);
+ void moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = 0);
// Allow LayoutRubyRun to manipulate the children within ruby bases.
friend class LayoutRubyRun;
« no previous file with comments | « Source/core/layout/LayoutRuby.cpp ('k') | Source/core/layout/LayoutRubyBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698