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

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

Issue 7943004: Merge 94991 (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/RenderRubyText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderRubyText.h
===================================================================
--- Source/WebCore/rendering/RenderRubyText.h (revision 95427)
+++ Source/WebCore/rendering/RenderRubyText.h (working copy)
@@ -47,6 +47,8 @@
virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
private:
+ virtual bool avoidsFloats() const;
+
virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;
virtual void adjustInlineDirectionLineBounds(int expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const;
};
« no previous file with comments | « no previous file | Source/WebCore/rendering/RenderRubyText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698