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

style: Simplify the ruby text adjustment.

Browse source 
StyleBuilder keeps a reference to the parent style, so no need to get it as an
argument.
This commit is contained in:
Emilio Cobos Álvarez 2017-08-15 07:47:12 +02:00
parent e0b834033d
commit 3e2d87d8db
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/style_adjuster.rs
View file

@ -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();
}
@ -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);
}