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

Recreate style context only if the element was restyled during the traversal.

Browse source
This commit is contained in:
Hiroyuki Ikezoe 2017-07-15 11:18:38 +09:00
parent e700a66e9f
commit dddea0cd94
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ports/geckolib/glue.rs
View file

@ -257,7 +257,7 @@ pub extern "C" fn Servo_TraverseSubtree(root: RawGeckoElementBorrowed,
debug_assert!(!snapshots.is_null()); debug_assert!(!snapshots.is_null());
let element = GeckoElement(root); let element = GeckoElement(root);
debug!("Servo_TraverseSubtree: {:?}", element); debug!("Servo_TraverseSubtree: {:?} {:?}", element, restyle_behavior);
let traversal_flags = match (root_behavior, restyle_behavior) { let traversal_flags = match (root_behavior, restyle_behavior) {
(Root::Normal, Restyle::Normal) | (Root::Normal, Restyle::Normal) |
@ -2730,11 +2730,16 @@ pub extern "C" fn Servo_NoteExplicitHints(element: RawGeckoElementBorrowed,
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed, pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed,
restyle_behavior: structs::TraversalRestyleBehavior) -> nsChangeHint restyle_behavior: structs::TraversalRestyleBehavior,
was_restyled: *mut bool) -> nsChangeHint
{ {
let mut was_restyled = unsafe { was_restyled.as_mut().unwrap() };
let element = GeckoElement(element); let element = GeckoElement(element);
let damage = match element.mutate_data() { let damage = match element.mutate_data() {
Some(mut data) => { Some(mut data) => {
*was_restyled = data.restyle.is_restyle();
let damage = data.restyle.damage; let damage = data.restyle.damage;
if restyle_behavior == structs::TraversalRestyleBehavior::ForThrottledAnimationFlush { if restyle_behavior == structs::TraversalRestyleBehavior::ForThrottledAnimationFlush {
debug_assert!(data.restyle.is_restyle() || damage.is_empty(), debug_assert!(data.restyle.is_restyle() || damage.is_empty(),
@ -2754,6 +2759,7 @@ pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed,
} }
None => { None => {
warn!("Trying to get change hint from unstyled element"); warn!("Trying to get change hint from unstyled element");
*was_restyled = false;
GeckoRestyleDamage::empty() GeckoRestyleDamage::empty()
} }
}; };