fixup! Bug 1383001: Remove (mostly) unused has_current_styles. r?heycam draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sat, 22 Jul 2017 14:59:09 +0200
changeset 613779 ecdc78c3ddc74de5e006b42d3ebe914b85da1763
parent 613778 ddc4b0c7d68aadd7d2c11803f8aa43c18f48f813
child 613780 b268456c87001c37f4d99490381034b0e2d43465
push id69841
push userbmo:emilio+bugs@crisal.io
push dateSat, 22 Jul 2017 13:13:24 +0000
reviewersheycam
bugs1383001
milestone56.0a1
fixup! Bug 1383001: Remove (mostly) unused has_current_styles. r?heycam
servo/components/style/style_resolver.rs
--- a/servo/components/style/style_resolver.rs
+++ b/servo/components/style/style_resolver.rs
@@ -46,17 +46,17 @@ pub struct PrimaryStyle {
 
 fn with_default_parent_styles<E, F, R>(element: E, f: F) -> R
 where
     E: TElement,
     F: FnOnce(Option<&ComputedValues>, Option<&ComputedValues>) -> R,
 {
     let parent_el = element.inheritance_parent();
     let parent_data = parent_el.as_ref().and_then(|e| e.borrow_data());
-    let parent_style = parent_data.as_ref().map(|d| d.styles.primary())
+    let parent_style = parent_data.as_ref().map(|d| d.styles.primary());
 
     let mut layout_parent_el = parent_el.clone();
     let layout_parent_data;
     let mut layout_parent_style = parent_style;
     if parent_style.map_or(false, |s| s.is_display_contents()) {
         layout_parent_el = Some(layout_parent_el.unwrap().layout_parent());
         layout_parent_data = layout_parent_el.as_ref().unwrap().borrow_data().unwrap();
         layout_parent_style = Some(layout_parent_data.styles.primary());