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

Hackily return default computed values for unstyled nodes.

Browse source
This commit is contained in:
Bobby Holley 2016-05-04 16:44:34 -07:00
parent 29ed650160
commit 38a6b58a0a
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ports/geckolib/glue.rs
View file

@ -258,9 +258,20 @@ pub extern "C" fn Servo_ReleaseStyleSheet(sheet: *mut RawServoStyleSheet) -> ()
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_GetComputedValues(node: *mut RawGeckoNode) pub extern "C" fn Servo_GetComputedValues(node: *mut RawGeckoNode)
-> *mut ServoComputedValues { -> *mut ServoComputedValues {
use selectors::Element;
let node = unsafe { GeckoNode::from_raw(node) }; let node = unsafe { GeckoNode::from_raw(node) };
let arc_cv = node.borrow_data().map(|data| data.style.clone()); let arc_cv = match node.borrow_data().map_or(None, |data| data.style.clone()) {
arc_cv.map_or(ptr::null_mut(), |arc| unsafe { transmute(arc) }) Some(style) => style,
None => {
// FIXME(bholley): This case subverts the intended semantics of this
// function, and exists only to make stylo builds more robust corner-
// cases where Gecko wants the style for a node that Servo never
// traversed. We should remove this as soon as possible.
error!("stylo: encountered unstyled node, substituting default values.");
Arc::new(GeckoComputedValues::initial_values().clone())
},
};
unsafe { transmute(arc_cv) }
} }
#[no_mangle] #[no_mangle]