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

Unified Diff: Source/WebCore/rendering/RenderRubyBase.h

Issue 7941019: Merge 95462 - Source/WebCore: Issues with merging ruby bases. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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 | « no previous file | Source/WebCore/rendering/RenderRubyBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderRubyBase.h
===================================================================
--- Source/WebCore/rendering/RenderRubyBase.h (revision 95467)
+++ Source/WebCore/rendering/RenderRubyBase.h (working copy)
@@ -54,10 +54,10 @@
bool hasOnlyWrappedInlineChildren(RenderObject* beforeChild = 0) const;
- void moveChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
- void moveInlineChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
- void moveBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
- void mergeBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
+ void moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
+ void moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
+ void moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
+ void mergeBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
RenderRubyRun* rubyRun() const;
« no previous file with comments | « no previous file | Source/WebCore/rendering/RenderRubyBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698