servo: Merge #17351 - style: Tweak an import (from heycam:nit); r=emilio

Source-Repo: https://github.com/servo/servo
Source-Revision: 4d54f2c9bbc700f06cfef7d85df5f43bdbcf085d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a69a806c6044e0f60cba1c08ab446dcf42230471
This commit is contained in:
Cameron McCormack 2017-06-15 22:50:53 -07:00
Родитель 1cd004d181
Коммит 0d10d88134
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -8,8 +8,6 @@
use app_units::Au; use app_units::Au;
use properties::{self, CascadeFlags, ComputedValues}; use properties::{self, CascadeFlags, ComputedValues};
use properties::{SKIP_ROOT_AND_ITEM_BASED_DISPLAY_FIXUP, StyleBuilder}; use properties::{SKIP_ROOT_AND_ITEM_BASED_DISPLAY_FIXUP, StyleBuilder};
#[cfg(feature = "gecko")]
use properties::PROHIBIT_DISPLAY_CONTENTS;
use properties::longhands::display::computed_value::T as display; use properties::longhands::display::computed_value::T as display;
use properties::longhands::float::computed_value::T as float; use properties::longhands::float::computed_value::T as float;
use properties::longhands::overflow_x::computed_value::T as overflow; use properties::longhands::overflow_x::computed_value::T as overflow;
@ -281,6 +279,8 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
/// Native anonymous content converts display:contents into display:inline. /// Native anonymous content converts display:contents into display:inline.
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
fn adjust_for_prohibited_display_contents(&mut self, flags: CascadeFlags) { fn adjust_for_prohibited_display_contents(&mut self, flags: CascadeFlags) {
use properties::PROHIBIT_DISPLAY_CONTENTS;
// TODO: We should probably convert display:contents into display:none // TODO: We should probably convert display:contents into display:none
// in some cases too: https://drafts.csswg.org/css-display/#unbox // in some cases too: https://drafts.csswg.org/css-display/#unbox
if !flags.contains(PROHIBIT_DISPLAY_CONTENTS) || if !flags.contains(PROHIBIT_DISPLAY_CONTENTS) ||