mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
style: fix formatting.
This commit is contained in:
parent
97f29c893f
commit
bb8c3ee8ba
4 changed files with 18 additions and 13 deletions
|
@ -11,7 +11,7 @@ use euclid::{point2, vec2};
|
|||
use font_kit::family_name::FamilyName;
|
||||
use font_kit::font::Font;
|
||||
use font_kit::metrics::Metrics;
|
||||
use font_kit::properties::{Properties, Weight, Stretch, Style};
|
||||
use font_kit::properties::{Properties, Stretch, Style, Weight};
|
||||
use font_kit::source::SystemSource;
|
||||
use gfx::font::FontHandleMethods;
|
||||
use gfx::font_cache_thread::FontCacheThread;
|
||||
|
@ -1385,9 +1385,7 @@ fn to_font_kit_family(font_family: &font::SingleFontFamily) -> FamilyName {
|
|||
font::GenericFontFamily::Monospace => FamilyName::Monospace,
|
||||
font::GenericFontFamily::Fantasy => FamilyName::Fantasy,
|
||||
font::GenericFontFamily::Cursive => FamilyName::Cursive,
|
||||
font::GenericFontFamily::None => {
|
||||
unreachable!("Shouldn't appear in computed values")
|
||||
},
|
||||
font::GenericFontFamily::None => unreachable!("Shouldn't appear in computed values"),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
@ -1411,7 +1409,7 @@ fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Font {
|
|||
font::FontStyle::Oblique(..) => {
|
||||
// TODO: support oblique angle.
|
||||
Style::Oblique
|
||||
}
|
||||
},
|
||||
})
|
||||
.weight(Weight(style.font_weight.0))
|
||||
.stretch(Stretch(style.font_stretch.value()));
|
||||
|
|
|
@ -1241,11 +1241,17 @@ impl<'le> TElement for GeckoElement<'le> {
|
|||
}
|
||||
}
|
||||
|
||||
fn animation_rule(&self, _: &SharedStyleContext) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
|
||||
fn animation_rule(
|
||||
&self,
|
||||
_: &SharedStyleContext,
|
||||
) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
|
||||
get_animation_rule(self, CascadeLevel::Animations)
|
||||
}
|
||||
|
||||
fn transition_rule(&self, _: &SharedStyleContext) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
|
||||
fn transition_rule(
|
||||
&self,
|
||||
_: &SharedStyleContext,
|
||||
) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
|
||||
get_animation_rule(self, CascadeLevel::Transitions)
|
||||
}
|
||||
|
||||
|
|
|
@ -421,11 +421,12 @@ trait PrivateMatchMethods: TElement {
|
|||
new_values,
|
||||
/* pseudo_element = */ None,
|
||||
) {
|
||||
let after_change_style = if self.has_css_transitions(context.shared, /* pseudo_element = */ None) {
|
||||
self.after_change_style(context, new_values)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let after_change_style =
|
||||
if self.has_css_transitions(context.shared, /* pseudo_element = */ None) {
|
||||
self.after_change_style(context, new_values)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
// In order to avoid creating a SequentialTask for transitions which
|
||||
// may not be updated, we check it per property to make sure Gecko
|
||||
|
|
|
@ -40,7 +40,7 @@ fn flexbox_enabled() -> bool {
|
|||
return servo_config::prefs::pref_map()
|
||||
.get("layout.flexbox.enabled")
|
||||
.as_bool()
|
||||
.unwrap_or(false)
|
||||
.unwrap_or(false);
|
||||
}
|
||||
|
||||
true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue