mirror of
https://github.com/servo/servo.git
synced 2025-08-04 05:00:08 +01:00
Further changes required by Servo
This commit is contained in:
parent
d1aeb3921b
commit
f5cf952525
2 changed files with 15 additions and 3 deletions
|
@ -860,7 +860,7 @@ where
|
||||||
shared: &context.style_context,
|
shared: &context.style_context,
|
||||||
thread_local: &mut tlc,
|
thread_local: &mut tlc,
|
||||||
};
|
};
|
||||||
let styles = resolve_style(&mut context, element, RuleInclusion::All, None);
|
let styles = resolve_style(&mut context, element, RuleInclusion::All, None, None);
|
||||||
styles.primary().clone()
|
styles.primary().clone()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -916,7 +916,13 @@ pub fn process_resolved_style_request<'dom>(
|
||||||
thread_local: &mut tlc,
|
thread_local: &mut tlc,
|
||||||
};
|
};
|
||||||
|
|
||||||
let styles = resolve_style(&mut context, element, RuleInclusion::All, pseudo.as_ref());
|
let styles = resolve_style(
|
||||||
|
&mut context,
|
||||||
|
element,
|
||||||
|
RuleInclusion::All,
|
||||||
|
pseudo.as_ref(),
|
||||||
|
None,
|
||||||
|
);
|
||||||
let style = styles.primary();
|
let style = styles.primary();
|
||||||
let longhand_id = match *property {
|
let longhand_id = match *property {
|
||||||
PropertyId::LonghandAlias(id, _) | PropertyId::Longhand(id) => id,
|
PropertyId::LonghandAlias(id, _) | PropertyId::Longhand(id) => id,
|
||||||
|
|
|
@ -361,7 +361,13 @@ pub fn process_resolved_style_request_for_unstyled_node<'dom>(
|
||||||
};
|
};
|
||||||
|
|
||||||
let element = node.as_element().unwrap();
|
let element = node.as_element().unwrap();
|
||||||
let styles = resolve_style(&mut context, element, RuleInclusion::All, pseudo.as_ref());
|
let styles = resolve_style(
|
||||||
|
&mut context,
|
||||||
|
element,
|
||||||
|
RuleInclusion::All,
|
||||||
|
pseudo.as_ref(),
|
||||||
|
None,
|
||||||
|
);
|
||||||
let style = styles.primary();
|
let style = styles.primary();
|
||||||
let longhand_id = match *property {
|
let longhand_id = match *property {
|
||||||
PropertyId::LonghandAlias(id, _) | PropertyId::Longhand(id) => id,
|
PropertyId::LonghandAlias(id, _) | PropertyId::Longhand(id) => id,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue