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

Push elements in order in StyleBloom::rebuilds.

Browse source 
This is important because we're about to start storing a parallel list
of pushed hashes, and the current behavior here will cause mismatches
there.

We take the opportunity to bump the SmallVec size to 16, since each
entry is only a word and we really want to avoid heap-allocating. And
then we switch to drain(), because of
https://github.com/rust-lang/rust/issues/42763
This commit is contained in:
Bobby Holley 2017-05-27 12:56:53 +02:00
parent ed5485ed18
commit 0f0e0d81fb
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/bloom.rs
View file

@ -139,13 +139,15 @@ impl<E: TElement> StyleBloom<E> {
pub fn rebuild(&mut self, mut element: E) { pub fn rebuild(&mut self, mut element: E) {
self.clear(); self.clear();
let mut parents_to_insert = SmallVec::<[E; 16]>::new();
while let Some(parent) = element.traversal_parent() { while let Some(parent) = element.traversal_parent() {
self.push_internal(parent); parents_to_insert.push(parent);
element = parent; element = parent;
} }
// Put them in the order we expect, from root to `element`'s parent. for parent in parents_to_insert.drain().rev() {
self.elements.reverse(); self.push(parent);
}
} }
/// In debug builds, asserts that all the parents of `element` are in the /// In debug builds, asserts that all the parents of `element` are in the
@ -238,7 +240,7 @@ impl<E: TElement> StyleBloom<E> {
// Let's collect the parents we are going to need to insert once we've // Let's collect the parents we are going to need to insert once we've
// found the common one. // found the common one.
let mut parents_to_insert = SmallVec::<[E; 8]>::new(); let mut parents_to_insert = SmallVec::<[E; 16]>::new();
// If the bloom filter still doesn't have enough elements, the common // If the bloom filter still doesn't have enough elements, the common
// parent is up in the dom. // parent is up in the dom.
@ -284,7 +286,7 @@ impl<E: TElement> StyleBloom<E> {
// Now the parents match, so insert the stack of elements we have been // Now the parents match, so insert the stack of elements we have been
// collecting so far. // collecting so far.
for parent in parents_to_insert.into_iter().rev() { for parent in parents_to_insert.drain().rev() {
self.push(parent); self.push(parent);
} }