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

stylo: Make TraverseSubtree cheaper in the initial styling case.

Browse source 
We assert against the display: none / unstyled parent already, so there's no
need to check it here as well.
This commit is contained in:
Emilio Cobos Álvarez 2017-11-22 21:07:34 +01:00
parent a812af51d6
commit b13f62714a
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 51 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

80
ports/geckolib/glue.rs
View file

@ -228,24 +228,14 @@ fn create_shared_context<'a>(global_style_data: &GlobalStyleData,
} }
} }
fn traverse_subtree(element: GeckoElement, fn traverse_subtree(
raw_data: RawServoStyleSetBorrowed, element: GeckoElement,
traversal_flags: TraversalFlags, global_style_data: &GlobalStyleData,
snapshots: &ServoElementSnapshotTable) { per_doc_data: &PerDocumentStyleDataImpl,
// When new content is inserted in a display:none subtree, we will call into guard: &SharedRwLockReadGuard,
// servo to try to style it. Detect that here and bail out. traversal_flags: TraversalFlags,
if let Some(parent) = element.traversal_parent() { snapshots: &ServoElementSnapshotTable,
if parent.borrow_data().map_or(true, |d| d.styles.is_display_none()) { ) {
debug!("{:?} has unstyled parent {:?} - ignoring call to traverse_subtree", element, parent);
return;
}
}
let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow();
debug_assert!(!per_doc_data.stylist.stylesheets_have_changed());
let global_style_data = &*GLOBAL_STYLE_DATA;
let guard = global_style_data.shared_lock.read();
let shared_style_context = create_shared_context( let shared_style_context = create_shared_context(
&global_style_data, &global_style_data,
&guard, &guard,
@ -295,23 +285,50 @@ pub extern "C" fn Servo_TraverseSubtree(
debug!("Servo_TraverseSubtree (flags={:?})", traversal_flags); debug!("Servo_TraverseSubtree (flags={:?})", traversal_flags);
debug!("{:?}", ShowSubtreeData(element.as_node())); debug!("{:?}", ShowSubtreeData(element.as_node()));
if cfg!(debug_assertions) {
if let Some(parent) = element.traversal_parent() {
let data =
parent.borrow_data().expect("Styling element with unstyled parent");
assert!(
!data.styles.is_display_none(),
"Styling element with display: none parent"
);
}
}
let needs_animation_only_restyle = let needs_animation_only_restyle =
element.has_animation_only_dirty_descendants() || element.has_animation_only_dirty_descendants() ||
element.has_animation_restyle_hints(); element.has_animation_restyle_hints();
let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow();
debug_assert!(!per_doc_data.stylist.stylesheets_have_changed());
let global_style_data = &*GLOBAL_STYLE_DATA;
let guard = global_style_data.shared_lock.read();
let was_initial_style = element.get_data().is_none();
if needs_animation_only_restyle { if needs_animation_only_restyle {
debug!("Servo_TraverseSubtree doing animation-only restyle (aodd={})", debug!("Servo_TraverseSubtree doing animation-only restyle (aodd={})",
element.has_animation_only_dirty_descendants()); element.has_animation_only_dirty_descendants());
traverse_subtree(element, traverse_subtree(
raw_data, element,
traversal_flags | TraversalFlags::AnimationOnly, &global_style_data,
unsafe { &*snapshots }); &per_doc_data,
&guard,
traversal_flags | TraversalFlags::AnimationOnly,
unsafe { &*snapshots },
);
} }
traverse_subtree(element, traverse_subtree(
raw_data, element,
traversal_flags, &global_style_data,
unsafe { &*snapshots }); &per_doc_data,
&guard,
traversal_flags,
unsafe { &*snapshots },
);
debug!("Servo_TraverseSubtree complete (dd={}, aodd={}, lfcd={}, lfc={}, data={:?})", debug!("Servo_TraverseSubtree complete (dd={}, aodd={}, lfcd={}, lfc={}, data={:?})",
element.has_dirty_descendants(), element.has_dirty_descendants(),
@ -320,9 +337,14 @@ pub extern "C" fn Servo_TraverseSubtree(
element.needs_frame(), element.needs_frame(),
element.borrow_data().unwrap()); element.borrow_data().unwrap());
let element_was_restyled = if was_initial_style {
element.borrow_data().unwrap().contains_restyle_data(); debug_assert!(!element.borrow_data().unwrap().contains_restyle_data());
element_was_restyled false
} else {
let element_was_restyled =
element.borrow_data().unwrap().contains_restyle_data();
element_was_restyled
}
} }
/// Checks whether the rule tree has crossed its threshold for unused nodes, and /// Checks whether the rule tree has crossed its threshold for unused nodes, and