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

Use SmallBitVec to replace BitVec

Browse source
This commit is contained in:
Matt Brubeck 2017-09-08 21:11:23 -07:00
parent 4721ef81fd
commit 21006fb752
5 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/sharing/mod.rs
View file

@ -67,7 +67,6 @@
use Atom;
use applicable_declarations::ApplicableDeclarationBlock;
use atomic_refcell::{AtomicRefCell, AtomicRefMut};
use bit_vec::BitVec;
use bloom::StyleBloom;
use cache::{LRUCache, LRUCacheMutIterator};
use context::{SelectorFlagsMap, SharedStyleContext, StyleContext};
@ -78,6 +77,7 @@ use owning_ref::OwningHandle;
use properties::ComputedValues;
use selectors::matching::{ElementSelectorFlags, VisitedHandlingMode};
use servo_arc::Arc;
use smallbitvec::SmallBitVec;
use smallvec::SmallVec;
use std::marker::PhantomData;
use std::mem;
@ -123,7 +123,7 @@ pub struct ValidationData {
/// The cached result of matching this entry against the revalidation
/// selectors.
revalidation_match_results: Option<BitVec>,
revalidation_match_results: Option<SmallBitVec>,
}
impl ValidationData {
@ -177,7 +177,7 @@ impl ValidationData {
bloom: &StyleBloom<E>,
bloom_known_valid: bool,
flags_setter: &mut F
) -> &BitVec
) -> &SmallBitVec
where E: TElement,
F: FnMut(&E, ElementSelectorFlags),
{
@ -256,7 +256,7 @@ impl<E: TElement> StyleSharingCandidate<E> {
&mut self,
stylist: &Stylist,
bloom: &StyleBloom<E>,
) -> &BitVec {
) -> &SmallBitVec {
self.validation_data.revalidation_match_results(
self.element,
stylist,
@ -309,7 +309,7 @@ impl<E: TElement> StyleSharingTarget<E> {
stylist: &Stylist,
bloom: &StyleBloom<E>,
selector_flags_map: &mut SelectorFlagsMap<E>
) -> &BitVec {
) -> &SmallBitVec {
// It's important to set the selector flags. Otherwise, if we succeed in
// sharing the style, we may not set the slow selector flags for the
// right elements (which may not necessarily be |element|), causing