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

stylo: Return the proper style for nonexistent pseudos.

Browse source 
Bug: 1364880
Reviewed-By: bz
MozReview-Commit-ID: 5DH6s2EyXii
This commit is contained in:
Emilio Cobos Álvarez 2017-06-24 07:51:16 +02:00
parent bc3ec0ce1b
commit 09f1b437bf
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 56 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

79
ports/geckolib/glue.rs
View file

@ -1452,10 +1452,10 @@ pub extern "C" fn Servo_ResolvePseudoStyle(element: RawGeckoElementBorrowed,
{ {
let element = GeckoElement(element); let element = GeckoElement(element);
let data = unsafe { element.ensure_data() }.borrow_mut(); let data = unsafe { element.ensure_data() }.borrow_mut();
let doc_data = PerDocumentStyleData::from_ffi(raw_data); let doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow();
debug!("Servo_ResolvePseudoStyle: {:?} {:?}", element, debug!("Servo_ResolvePseudoStyle: {:?} {:?}, is_probe: {}",
PseudoElement::from_pseudo_type(pseudo_type)); element, PseudoElement::from_pseudo_type(pseudo_type), is_probe);
// FIXME(bholley): Assert against this. // FIXME(bholley): Assert against this.
if !data.has_styles() { if !data.has_styles() {
@ -1463,7 +1463,7 @@ pub extern "C" fn Servo_ResolvePseudoStyle(element: RawGeckoElementBorrowed,
return if is_probe { return if is_probe {
Strong::null() Strong::null()
} else { } else {
doc_data.borrow().default_computed_values().clone().into_strong() doc_data.default_computed_values().clone().into_strong()
}; };
} }
@ -1472,13 +1472,22 @@ pub extern "C" fn Servo_ResolvePseudoStyle(element: RawGeckoElementBorrowed,
let global_style_data = &*GLOBAL_STYLE_DATA; let global_style_data = &*GLOBAL_STYLE_DATA;
let guard = global_style_data.shared_lock.read(); let guard = global_style_data.shared_lock.read();
match get_pseudo_style(&guard, element, &pseudo, RuleInclusion::All, let style = get_pseudo_style(
&data.styles, &*doc_data.borrow()) { &guard,
Some(values) => values.into_strong(), element,
// FIXME(emilio): This looks pretty wrong! Shouldn't it be at least an &pseudo,
// empty style inheriting from the element? RuleInclusion::All,
None if !is_probe => data.styles.primary().clone().into_strong(), &data.styles,
None => Strong::null(), &*doc_data,
is_probe
);
match style {
Some(s) => s.into_strong(),
None => {
debug_assert!(is_probe);
Strong::null()
}
} }
} }
@ -1502,15 +1511,16 @@ pub extern "C" fn Servo_HasAuthorSpecifiedRules(element: RawGeckoElementBorrowed
author_colors_allowed) author_colors_allowed)
} }
fn get_pseudo_style(guard: &SharedRwLockReadGuard, fn get_pseudo_style(
element: GeckoElement, guard: &SharedRwLockReadGuard,
pseudo: &PseudoElement, element: GeckoElement,
rule_inclusion: RuleInclusion, pseudo: &PseudoElement,
styles: &ElementStyles, rule_inclusion: RuleInclusion,
doc_data: &PerDocumentStyleDataImpl) styles: &ElementStyles,
-> Option<Arc<ComputedValues>> doc_data: &PerDocumentStyleDataImpl,
{ is_probe: bool,
match pseudo.cascade_type() { ) -> Option<Arc<ComputedValues>> {
let style = match pseudo.cascade_type() {
PseudoElementCascadeType::Eager => styles.pseudos.get(&pseudo).map(|s| s.clone()), PseudoElementCascadeType::Eager => styles.pseudos.get(&pseudo).map(|s| s.clone()),
PseudoElementCascadeType::Precomputed => unreachable!("No anonymous boxes"), PseudoElementCascadeType::Precomputed => unreachable!("No anonymous boxes"),
PseudoElementCascadeType::Lazy => { PseudoElementCascadeType::Lazy => {
@ -1531,7 +1541,18 @@ fn get_pseudo_style(guard: &SharedRwLockReadGuard,
&metrics) &metrics)
.map(|s| s.clone()) .map(|s| s.clone())
}, },
};
if is_probe {
return style;
} }
Some(style.unwrap_or_else(|| {
Arc::new(StyleBuilder::for_inheritance(
styles.primary(),
doc_data.default_computed_values(),
).build())
}))
} }
#[no_mangle] #[no_mangle]
@ -2604,9 +2625,21 @@ pub extern "C" fn Servo_ResolveStyleLazily(element: RawGeckoElementBorrowed,
let data = doc_data.borrow(); let data = doc_data.borrow();
let rule_inclusion = RuleInclusion::from(rule_inclusion); let rule_inclusion = RuleInclusion::from(rule_inclusion);
let finish = |styles: &ElementStyles| -> Arc<ComputedValues> { let finish = |styles: &ElementStyles| -> Arc<ComputedValues> {
PseudoElement::from_pseudo_type(pseudo_type).and_then(|ref pseudo| { match PseudoElement::from_pseudo_type(pseudo_type) {
get_pseudo_style(&guard, element, pseudo, rule_inclusion, styles, &*data) Some(ref pseudo) => {
}).unwrap_or_else(|| styles.primary().clone()) get_pseudo_style(
&guard,
element,
pseudo,
rule_inclusion,
styles,
&*data,
/* is_probe = */ false,
).expect("We're not probing, so we should always get a style \
back")
}
None => styles.primary().clone(),
}
}; };
// In the common case we already have the style. Check that before setting // In the common case we already have the style. Check that before setting