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

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
Index: Source/core/layout/LayoutRubyBase.h
diff --git a/Source/core/layout/LayoutRubyBase.h b/Source/core/layout/LayoutRubyBase.h
index 93733f5fd0633138a99f5f8f98702b87d9647613..23e77b4ae3e774be39efbb9b6646f9983d3820d8 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*, RenderStyle*) const override;
+ virtual bool isChildAllowed(LayoutObject*, 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;

Powered by Google App Engine
This is Rietveld 408576698