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

Auto merge of #19758 - emilio:adjust-display-right, r=emilio

Browse source 
style: Adjust the writing-mode fixup to call set_adjusted_display on Servo.

This is functionally equivalent right now (set_adjusted_display will just do
set_display), but won't be after #19709.

<!-- 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/19758)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-13 06:00:45 -06:00 • committed by GitHub
commit e81193c5c9
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/style_adjuster.rs
View file

@ -193,7 +193,16 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
if our_writing_mode != parent_writing_mode &&
self.style.get_box().clone_display() == Display::Inline {
self.style.mutate_box().set_display(Display::InlineBlock);
// TODO(emilio): Figure out if we can just set the adjusted display
// on Gecko too and unify this code path.
if cfg!(feature = "servo") {
self.style.mutate_box().set_adjusted_display(
Display::InlineBlock,
false,
);
} else {
self.style.mutate_box().set_display(Display::InlineBlock);
}
}
}