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

Auto merge of #19264 - emilio:unused-arg, r=mbrubeck

Browse source 
style: Remove unused argument in element_needs_traversal.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19264)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-17 10:03:05 -06:00 • committed by GitHub
commit bd6caef234
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/traversal.rs
View file

@ -76,8 +76,7 @@ impl<'a, E> DomTraversal<E> for RecalcStyleAndConstructFlows<'a>
// flow construction:
// (1) They child doesn't yet have layout data (preorder traversal initializes it).
// (2) The parent element has restyle damage (so the text flow also needs fixup).
node.get_raw_data().is_none() ||
parent_data.damage != RestyleDamage::empty()
node.get_raw_data().is_none() || !parent_data.damage.is_empty()
}
fn shared_context(&self) -> &SharedStyleContext {

19
components/style/traversal.rs
View file

@ -155,8 +155,6 @@ pub trait DomTraversal<E: TElement> : Sync {
let mut data = root.mutate_data();
let mut data = data.as_mut().map(|d| &mut **d);
let parent = root.traversal_parent();
let parent_data = parent.as_ref().and_then(|p| p.borrow_data());
if let Some(ref mut data) = data {
if !traversal_flags.for_animation_only() {
@ -169,9 +167,9 @@ pub trait DomTraversal<E: TElement> : Sync {
data.invalidate_style_if_needed(root, shared_context, None, None);
if invalidation_result.has_invalidated_siblings() {
let actual_root =
parent.expect("How in the world can you invalidate \
siblings without a parent?");
let actual_root = root.traversal_parent()
.expect("How in the world can you invalidate \
siblings without a parent?");
unsafe { actual_root.set_dirty_descendants() }
return PreTraverseToken(Some(actual_root));
}
@ -182,7 +180,6 @@ pub trait DomTraversal<E: TElement> : Sync {
root,
traversal_flags,
data.as_mut().map(|d| &**d),
parent_data.as_ref().map(|d| &**d)
);
// If we're not going to traverse at all, we may need to clear some state
@ -203,17 +200,13 @@ pub trait DomTraversal<E: TElement> : Sync {
}
/// Returns true if traversal is needed for the given element and subtree.
///
/// The caller passes |parent_data|, which is only null if there is no
/// parent.
fn element_needs_traversal(
el: E,
traversal_flags: TraversalFlags,
data: Option<&ElementData>,
parent_data: Option<&ElementData>,
) -> bool {
debug!("element_needs_traversal({:?}, {:?}, {:?}, {:?})",
el, traversal_flags, data, parent_data);
debug!("element_needs_traversal({:?}, {:?}, {:?})",
el, traversal_flags, data);
if traversal_flags.contains(TraversalFlags::UnstyledOnly) {
return data.map_or(true, |d| !d.has_styles()) || el.has_dirty_descendants();
@ -845,7 +838,7 @@ where
);
}
if D::element_needs_traversal(child, flags, child_data.map(|d| &*d), Some(data)) {
if D::element_needs_traversal(child, flags, child_data.map(|d| &*d)) {
note_child(child_node);
// Set the dirty descendants bit on the parent as needed, so that we