Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Ensure nested ruby level container don't escape from line break suppression.

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D58351
This commit is contained in:
Xidorn Quan 2020-01-10 23:47:28 +00:00 • committed by Emilio Cobos Álvarez
parent 25fda147f3
commit ec37e7a5b8
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/style/style_adjuster.rs
View file

@ -547,7 +547,14 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
} }
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
fn should_suppress_linebreak(&self, layout_parent_style: &ComputedValues) -> bool { fn should_suppress_linebreak<E>(
&self,
layout_parent_style: &ComputedValues,
element: Option<E>,
) -> bool
where
E: TElement,
{
// Line break suppression should only be propagated to in-flow children. // Line break suppression should only be propagated to in-flow children.
if self.style.is_floating() || self.style.is_absolutely_positioned() { if self.style.is_floating() || self.style.is_absolutely_positioned() {
return false; return false;
@ -567,11 +574,18 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
// Ruby base and text are always non-breakable. // Ruby base and text are always non-breakable.
Display::RubyBase | Display::RubyText => true, Display::RubyBase | Display::RubyText => true,
// Ruby base container and text container are breakable. // Ruby base container and text container are breakable.
// Non-HTML elements may not form ruby base / text container because
// they may not respect ruby-internal display values, so we can't
// make them escaped from line break suppression.
// Note that, when certain HTML tags, e.g. form controls, have ruby // Note that, when certain HTML tags, e.g. form controls, have ruby
// level container display type, they could also escape from the // level container display type, they could also escape from the
// line break suppression flag while they shouldn't. However, it is // line break suppression flag while they shouldn't. However, it is
// generally fine since they themselves are non-breakable. // generally fine as far as they can't break the line inside them.
Display::RubyBaseContainer | Display::RubyTextContainer => false, Display::RubyBaseContainer | Display::RubyTextContainer
if element.map_or(true, |e| e.is_html_element()) =>
{
false
},
// Anything else is non-breakable if and only if its layout parent // Anything else is non-breakable if and only if its layout parent
// has a ruby display type, because any of the ruby boxes can be // has a ruby display type, because any of the ruby boxes can be
// anonymous. // anonymous.
@ -593,7 +607,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
let self_display = self.style.get_box().clone_display(); let self_display = self.style.get_box().clone_display();
// Check whether line break should be suppressed for this element. // Check whether line break should be suppressed for this element.
if self.should_suppress_linebreak(layout_parent_style) { if self.should_suppress_linebreak(layout_parent_style, element) {
self.style self.style
.add_flags(ComputedValueFlags::SHOULD_SUPPRESS_LINEBREAK); .add_flags(ComputedValueFlags::SHOULD_SUPPRESS_LINEBREAK);
// Inlinify the display type if allowed. // Inlinify the display type if allowed.