Title: [95428] branches/chromium/874/Source/WebCore/rendering
- Revision
- 95428
- Author
- infe...@chromium.org
- Date
- 2011-09-19 09:54:50 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94991
BUG=94810
Review URL: http://codereview.chromium.org/7943004
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp (95427 => 95428)
--- branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp 2011-09-19 16:52:24 UTC (rev 95427)
+++ branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp 2011-09-19 16:54:50 UTC (rev 95428)
@@ -81,4 +81,9 @@
logicalWidth -= inset;
}
+bool RenderRubyText::avoidsFloats() const
+{
+ return true;
+}
+
} // namespace WebCore
Modified: branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h (95427 => 95428)
--- branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h 2011-09-19 16:52:24 UTC (rev 95427)
+++ branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h 2011-09-19 16:54:50 UTC (rev 95428)
@@ -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;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
