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

Fix style computation for first-letter pseudo-elements with inline ancestors.

Browse source 
We should inherit from the inline, not its parent block.

Gecko bug 1324618 part 10 servo bits: https://bugzilla.mozilla.org/show_bug.cgi?id=1324618
This commit is contained in:
Boris Zbarsky 2017-06-26 23:29:18 -07:00
parent d40e27d6e5
commit 746f245f32
3 changed files with 63 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/style/stylist.rs
View file

@ -685,10 +685,28 @@ impl Stylist {
where E: TElement,
{
let rule_node =
match self.lazy_pseudo_rules(guards, element, pseudo, rule_inclusion) {
Some(rule_node) => rule_node,
None => return None
};
self.lazy_pseudo_rules(guards, element, pseudo, rule_inclusion);
self.compute_pseudo_element_style_with_rulenode(rule_node.as_ref(),
guards,
parent_style,
font_metrics)
}
/// Computes a pseudo-element style lazily using the given rulenode. This
/// can be used for truly lazy pseudo-elements or to avoid redoing selector
/// matching for eager pseudo-elements when we need to recompute their style
/// with a new parent style.
pub fn compute_pseudo_element_style_with_rulenode(&self,
rule_node: Option<&StrongRuleNode>,
guards: &StylesheetGuards,
parent_style: &ComputedValues,
font_metrics: &FontMetricsProvider)
-> Option<Arc<ComputedValues>>
{
let rule_node = match rule_node {
Some(rule_node) => rule_node,
None => return None
};
// Read the comment on `precomputed_values_for_pseudo` to see why it's
// difficult to assert that display: contents nodes never arrive here
@ -697,7 +715,7 @@ impl Stylist {
// Bug 1364242: We need to add visited support for lazy pseudos
let computed =
properties::cascade(&self.device,
&rule_node,
rule_node,
guards,
Some(parent_style),
Some(parent_style),