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

Hoist lookup() into lru_cache.

Browse source 
MozReview-Commit-ID: F5FbKFqpXEh
This commit is contained in:
Bobby Holley 2017-09-20 19:07:12 -07:00
parent 13a3cf27a8
commit 05c03d5104
2 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/lru_cache/lib.rs
View file

@ -89,6 +89,31 @@ impl<T, A: Array<Item=Entry<T>>> LRUCache<T, A> {
}
}
/// Performs a lookup on the cache with the given test routine. Touches
/// the result on a hit.
pub fn lookup<F, R>(&mut self, mut test_one: F) -> Option<R>
where
F: FnMut(&mut T) -> Option<R>
{
let mut result = None;
for (i, candidate) in self.iter_mut() {
if let Some(r) = test_one(candidate) {
result = Some((i, r));
break;
}
};
match result {
None => None,
Some((i, r)) => {
self.touch(i);
let front = self.front_mut().unwrap();
debug_assert!(test_one(front).is_some());
Some(r)
}
}
}
/// Insert a given key in the cache.
pub fn insert(&mut self, val: T) {
let entry = Entry { val, prev: 0, next: 0 };

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

@ -442,29 +442,6 @@ impl<E: TElement> SharingCache<E> {
};
self.entries.insert(StyleSharingCandidate { element, validation_data });
}
fn lookup<F, R>(&mut self, mut test_one: F) -> Option<R>
where
F: FnMut(&mut StyleSharingCandidate<E>) -> Option<R>
{
let mut result = None;
for (i, candidate) in self.entries.iter_mut() {
if let Some(r) = test_one(candidate) {
result = Some((i, r));
break;
}
};
match result {
None => None,
Some((i, r)) => {
self.entries.touch(i);
let front = self.entries.front_mut().unwrap();
debug_assert!(test_one(front).is_some());
Some(r)
}
}
}
}
/// Style sharing caches are are large allocations, so we store them in thread-local
@ -638,7 +615,7 @@ impl<E: TElement> StyleSharingCache<E> {
return None;
}
self.cache_mut().lookup(|candidate| {
self.cache_mut().entries.lookup(|candidate| {
Self::test_candidate(
target,
candidate,
@ -755,7 +732,7 @@ impl<E: TElement> StyleSharingCache<E> {
return None;
}
self.cache_mut().lookup(|candidate| {
self.cache_mut().entries.lookup(|candidate| {
debug_assert_ne!(candidate.element, target);
if !candidate.parent_style_identity().eq(inherited) {
return None;