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

Bug 1329854 - Don't lazily instantiate element data for unstyled elements when taking snapshots and noting explicit hints. r=heycam

Browse source
This commit is contained in:
Bobby Holley 2017-01-11 18:07:22 -08:00
parent 38fccce3ba
commit 22ae06258a
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ports/geckolib/glue.rs
View file

@ -874,11 +874,15 @@ unsafe fn maybe_restyle<'a>(data: &'a mut AtomicRefMut<ElementData>, element: Ge
pub extern "C" fn Servo_Element_GetSnapshot(element: RawGeckoElementBorrowed) -> *mut structs::ServoElementSnapshot pub extern "C" fn Servo_Element_GetSnapshot(element: RawGeckoElementBorrowed) -> *mut structs::ServoElementSnapshot
{ {
let element = GeckoElement(element); let element = GeckoElement(element);
let mut data = unsafe { element.ensure_data().borrow_mut() }; let snapshot = match element.mutate_data() {
let snapshot = if let Some(restyle_data) = unsafe { maybe_restyle(&mut data, element) } { None => ptr::null_mut(),
Some(mut data) => {
if let Some(restyle_data) = unsafe { maybe_restyle(&mut data, element) } {
restyle_data.snapshot.ensure(|| element.create_snapshot()).borrow_mut_raw() restyle_data.snapshot.ensure(|| element.create_snapshot()).borrow_mut_raw()
} else { } else {
ptr::null_mut() ptr::null_mut()
}
},
}; };
debug!("Servo_Element_GetSnapshot: {:?}: {:?}", element, snapshot); debug!("Servo_Element_GetSnapshot: {:?}: {:?}", element, snapshot);
@ -891,11 +895,13 @@ pub extern "C" fn Servo_NoteExplicitHints(element: RawGeckoElementBorrowed,
change_hint: nsChangeHint) { change_hint: nsChangeHint) {
let element = GeckoElement(element); let element = GeckoElement(element);
let damage = GeckoRestyleDamage::new(change_hint); let damage = GeckoRestyleDamage::new(change_hint);
let mut data = unsafe { element.ensure_data().borrow_mut() };
debug!("Servo_NoteExplicitHints: {:?}, restyle_hint={:?}, change_hint={:?}", debug!("Servo_NoteExplicitHints: {:?}, restyle_hint={:?}, change_hint={:?}",
element, restyle_hint, change_hint); element, restyle_hint, change_hint);
if let Some(restyle_data) = unsafe { maybe_restyle(&mut data, element) } { let mut maybe_data = element.mutate_data();
let maybe_restyle_data =
maybe_data.as_mut().and_then(|d| unsafe { maybe_restyle(d, element) });
if let Some(restyle_data) = maybe_restyle_data {
let restyle_hint: RestyleHint = restyle_hint.into(); let restyle_hint: RestyleHint = restyle_hint.into();
restyle_data.hint.insert(&restyle_hint.into()); restyle_data.hint.insert(&restyle_hint.into());
restyle_data.damage |= damage; restyle_data.damage |= damage;