Skip to content

Commit

Permalink
style: Simplify the ruby text adjustment.
Browse files Browse the repository at this point in the history
StyleBuilder keeps a reference to the parent style, so no need to get it as an
argument.
  • Loading branch information
emilio committed Aug 15, 2017
1 parent e0b8340 commit 3e2d87d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions components/style/style_adjuster.rs
Expand Up @@ -108,9 +108,9 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
///
/// Note that this, for Gecko, comes through Servo_ComputedValues_Inherit.
#[cfg(feature = "gecko")]
pub fn adjust_for_text(&mut self, parent_style: &ComputedValues) {
pub fn adjust_for_text(&mut self) {
self.adjust_for_text_combine_upright();
self.adjust_for_text_in_ruby(parent_style);
self.adjust_for_text_in_ruby();
self.set_bits();
}

Expand Down Expand Up @@ -144,9 +144,9 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
/// set (e.g. ruby or ruby containers), thus we may not inherit the flag
/// from them.
#[cfg(feature = "gecko")]
fn adjust_for_text_in_ruby(&mut self, parent_style: &ComputedValues) {
fn adjust_for_text_in_ruby(&mut self) {
use properties::computed_value_flags::SHOULD_SUPPRESS_LINEBREAK;
let parent_display = parent_style.get_box().clone_display();
let parent_display = self.style.get_parent_box().clone_display();
if parent_display.is_ruby_type() {
self.style.flags.insert(SHOULD_SUPPRESS_LINEBREAK);
}
Expand Down
2 changes: 1 addition & 1 deletion ports/geckolib/glue.rs
Expand Up @@ -1821,7 +1821,7 @@ pub extern "C" fn Servo_ComputedValues_Inherit(

if for_text {
StyleAdjuster::new(&mut style)
.adjust_for_text(reference);
.adjust_for_text();
}

style.build()
Expand Down

0 comments on commit 3e2d87d

Please sign in to comment.