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

Auto merge of #18083 - emilio:ruby-text, r=upsuper

Browse source 
style: Simplify the ruby text adjustment.

StyleAdjuster keeps a reference to the parent style, so no need to get it as an
argument.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18083)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-15 01:08:56 -05:00 • committed by GitHub
commit fff50acd81
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. /// Note that this, for Gecko, comes through Servo_ComputedValues_Inherit.
#[cfg(feature = "gecko")] #[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_combine_upright();
self.adjust_for_text_in_ruby(parent_style); self.adjust_for_text_in_ruby();
self.set_bits(); 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 /// set (e.g. ruby or ruby containers), thus we may not inherit the flag
/// from them. /// from them.
#[cfg(feature = "gecko")] #[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; 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() { if parent_display.is_ruby_type() {
self.style.flags.insert(SHOULD_SUPPRESS_LINEBREAK); self.style.flags.insert(SHOULD_SUPPRESS_LINEBREAK);
} }

2
ports/geckolib/glue.rs
View file

@ -1821,7 +1821,7 @@ pub extern "C" fn Servo_ComputedValues_Inherit(
if for_text { if for_text {
StyleAdjuster::new(&mut style) StyleAdjuster::new(&mut style)
.adjust_for_text(reference); .adjust_for_text();
} }
style.build() style.build()