style: fix formatting.

This commit is contained in:
Emilio Cobos Álvarez 2020-06-18 20:27:58 +02:00
parent 97f29c893f
commit bb8c3ee8ba
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
4 changed files with 18 additions and 13 deletions

View file

@ -11,7 +11,7 @@ use euclid::{point2, vec2};
use font_kit::family_name::FamilyName; use font_kit::family_name::FamilyName;
use font_kit::font::Font; use font_kit::font::Font;
use font_kit::metrics::Metrics; 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 font_kit::source::SystemSource;
use gfx::font::FontHandleMethods; use gfx::font::FontHandleMethods;
use gfx::font_cache_thread::FontCacheThread; 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::Monospace => FamilyName::Monospace,
font::GenericFontFamily::Fantasy => FamilyName::Fantasy, font::GenericFontFamily::Fantasy => FamilyName::Fantasy,
font::GenericFontFamily::Cursive => FamilyName::Cursive, font::GenericFontFamily::Cursive => FamilyName::Cursive,
font::GenericFontFamily::None => { font::GenericFontFamily::None => unreachable!("Shouldn't appear in computed values"),
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(..) => { font::FontStyle::Oblique(..) => {
// TODO: support oblique angle. // TODO: support oblique angle.
Style::Oblique Style::Oblique
} },
}) })
.weight(Weight(style.font_weight.0)) .weight(Weight(style.font_weight.0))
.stretch(Stretch(style.font_stretch.value())); .stretch(Stretch(style.font_stretch.value()));

View file

@ -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) 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) get_animation_rule(self, CascadeLevel::Transitions)
} }

View file

@ -421,7 +421,8 @@ trait PrivateMatchMethods: TElement {
new_values, new_values,
/* pseudo_element = */ None, /* pseudo_element = */ None,
) { ) {
let after_change_style = if self.has_css_transitions(context.shared, /* pseudo_element = */ None) { let after_change_style =
if self.has_css_transitions(context.shared, /* pseudo_element = */ None) {
self.after_change_style(context, new_values) self.after_change_style(context, new_values)
} else { } else {
None None

View file

@ -40,7 +40,7 @@ fn flexbox_enabled() -> bool {
return servo_config::prefs::pref_map() return servo_config::prefs::pref_map()
.get("layout.flexbox.enabled") .get("layout.flexbox.enabled")
.as_bool() .as_bool()
.unwrap_or(false) .unwrap_or(false);
} }
true true