Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1141919 - Fix incomplete line break suppression in ruby. r=dbaron

Browse Source 
--HG--
extra : source : 15d558f97b7d2523fa946925e753326dda51467c
This commit is contained in:
Xidorn Quan 2015-03-14 16:29:06 +11:00
parent cf9dd93a66
commit 5193b10097
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/style/nsStyleContext.cpp
View File

@ -538,9 +538,13 @@ ShouldSuppressLineBreak(const nsStyleDisplay* aStyleDisplay,
// the level containers themselves are breakable. We have to check
// the container display type against all ruby display type here
// because any of the ruby boxes could be anonymous.
if (aContainerDisplay->IsRubyDisplayType() &&
aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER &&
aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER) {
if ((aContainerDisplay->IsRubyDisplayType() &&
aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER &&
aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER) ||
// Since ruby base and ruby text may exist themselves without any
// non-anonymous frame outside, we should also check them.
aStyleDisplay->mDisplay == NS_STYLE_DISPLAY_RUBY_BASE ||
aStyleDisplay->mDisplay == NS_STYLE_DISPLAY_RUBY_TEXT) {
return true;
}
return false;