diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/main/css/matching.rs | 32 | ||||
| -rw-r--r-- | src/components/style/selector_matching.rs | 16 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/components/main/css/matching.rs b/src/components/main/css/matching.rs index 62e805a1745..5c74cfa7fe9 100644 --- a/src/components/main/css/matching.rs +++ b/src/components/main/css/matching.rs @@ -40,22 +40,22 @@ impl<'ln> MatchMethods for LayoutNode<'ln> { let mut layout_data_ref = self.mutate_layout_data(); match *layout_data_ref.get() { Some(ref mut layout_data) => { - stylist.get_applicable_declarations(self, - style_attribute, - None, - &mut layout_data.data.applicable_declarations); - stylist.get_applicable_declarations(self, - None, - Some(Before), - &mut layout_data - .data - .before_applicable_declarations); - stylist.get_applicable_declarations(self, - None, - Some(After), - &mut layout_data - .data - .after_applicable_declarations); + stylist.push_applicable_declarations(self, + style_attribute, + None, + &mut layout_data.data.applicable_declarations); + stylist.push_applicable_declarations(self, + None, + Some(Before), + &mut layout_data + .data + .before_applicable_declarations); + stylist.push_applicable_declarations(self, + None, + Some(After), + &mut layout_data + .data + .after_applicable_declarations); } None => fail!("no layout data") } diff --git a/src/components/style/selector_matching.rs b/src/components/style/selector_matching.rs index 3e44f6185ac..ccaf715b387 100644 --- a/src/components/style/selector_matching.rs +++ b/src/components/style/selector_matching.rs @@ -358,14 +358,14 @@ impl Stylist { /// Returns the applicable CSS declarations for the given element. This corresponds to /// `ElementRuleCollector` in WebKit. - pub fn get_applicable_declarations<E:TElement, - N:TNode<E>, - V:SmallVec<Arc<~[PropertyDeclaration]>>>( - &self, - element: &N, - style_attribute: Option<&PropertyDeclarationBlock>, - pseudo_element: Option<PseudoElement>, - applicable_declarations: &mut V) { + pub fn push_applicable_declarations<E:TElement, + N:TNode<E>, + V:SmallVec<Arc<~[PropertyDeclaration]>>>( + &self, + element: &N, + style_attribute: Option<&PropertyDeclarationBlock>, + pseudo_element: Option<PseudoElement>, + applicable_declarations: &mut V) { assert!(element.is_element()); assert!(style_attribute.is_none() || pseudo_element.is_none(), "Style attributes do not apply to pseudo-elements"); |