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

style: Make a bloom filter arrive to restyle hint computation.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-05-19 05:00:29 +02:00
parent 1cea4e7942
commit a12996f030
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 107 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

40
components/style/traversal.rs
View file

@ -9,7 +9,7 @@ use context::{SharedStyleContext, StyleContext, ThreadLocalStyleContext};
use data::{ElementData, ElementStyles, StoredRestyleHint};
use dom::{DirtyDescendants, NodeInfo, OpaqueNode, TElement, TNode};
use matching::{ChildCascadeRequirement, MatchMethods, StyleSharingBehavior};
use restyle_hints::RestyleHint;
use restyle_hints::{HintComputationContext, RestyleHint};
use selector_parser::RestyleDamage;
#[cfg(feature = "servo")] use servo_config::opts;
use std::borrow::BorrowMut;
@ -123,7 +123,8 @@ pub trait DomTraversal<E: TElement> : Sync {
type ThreadLocalContext: Send + BorrowMut<ThreadLocalStyleContext<E>>;
/// Process `node` on the way down, before its children have been processed.
fn process_preorder(&self, data: &PerLevelTraversalData,
fn process_preorder(&self,
data: &PerLevelTraversalData,
thread_local: &mut Self::ThreadLocalContext,
node: E::ConcreteNode);
@ -227,7 +228,10 @@ pub trait DomTraversal<E: TElement> : Sync {
// Expanding snapshots here may create a LATER_SIBLINGS restyle hint, which
// we propagate to the next sibling element.
if let Some(mut data) = root.mutate_data() {
let later_siblings = data.compute_final_hint(root, shared_context);
let later_siblings =
data.compute_final_hint(root,
shared_context,
HintComputationContext::Root);
if later_siblings {
if let Some(next) = root.next_sibling_element() {
if let Some(mut next_data) = next.mutate_data() {
@ -669,11 +673,12 @@ pub fn recalc_style_at<E, D>(traversal: &D,
r.damage_handled() | r.damage.handled_for_descendants()
});
preprocess_children(traversal,
element,
propagated_hint,
damage_handled,
inherited_style_changed);
preprocess_children::<E, D>(context,
traversal_data,
element,
propagated_hint,
damage_handled,
inherited_style_changed);
}
// If we are in a restyle for reconstruction, drop the existing restyle
@ -740,7 +745,8 @@ fn compute_style<E, D>(_traversal: &D,
MatchAndCascade => {
// Ensure the bloom filter is up to date.
context.thread_local.bloom_filter
.insert_parents_recovering(element, traversal_data.current_dom_depth);
.insert_parents_recovering(element,
traversal_data.current_dom_depth);
context.thread_local.bloom_filter.assert_complete(element);
context.thread_local.statistics.elements_matched += 1;
@ -770,15 +776,17 @@ fn compute_style<E, D>(_traversal: &D,
}
}
fn preprocess_children<E, D>(traversal: &D,
fn preprocess_children<E, D>(context: &mut StyleContext<E>,
parent_traversal_data: &PerLevelTraversalData,
element: E,
mut propagated_hint: StoredRestyleHint,
damage_handled: RestyleDamage,
parent_inherited_style_changed: bool)
where E: TElement,
D: DomTraversal<E>
D: DomTraversal<E>,
{
trace!("preprocess_children: {:?}", element);
// Loop over all the children.
for child in element.as_node().children() {
// FIXME(bholley): Add TElement::element_children instead of this.
@ -787,7 +795,8 @@ fn preprocess_children<E, D>(traversal: &D,
None => continue,
};
let mut child_data = unsafe { D::ensure_element_data(&child).borrow_mut() };
let mut child_data =
unsafe { D::ensure_element_data(&child).borrow_mut() };
// If the child is unstyled, we don't need to set up any restyling.
if !child_data.has_styles() {
@ -798,7 +807,12 @@ fn preprocess_children<E, D>(traversal: &D,
//
// NB: This will be a no-op if there's no restyle data and no snapshot.
let later_siblings =
child_data.compute_final_hint(child, traversal.shared_context());
child_data.compute_final_hint(child,
&context.shared,
HintComputationContext::Child {
local_context: &mut context.thread_local,
dom_depth: parent_traversal_data.current_dom_depth + 1,
});
trace!(" > {:?} -> {:?} + {:?}, pseudo: {:?}, later_siblings: {:?}",
child,