Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1643 : saneyuki/servo/1641, r=SimonSapin

Browse source 
This will fix #1641
r?
This commit is contained in:
bors-servo 2014-02-08 15:43:41 -05:00
commit 9305a95b68
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/main/css/matching.rs
View file

@ -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")
}

16
src/components/style/selector_matching.rs
View file

@ -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");