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

Upgrade to uluru 2

Browse source
This commit is contained in:
Leonardo Razovic 2021-07-15 18:28:12 +02:00
parent c5ed0430bb
commit ef7eb02b8d
No known key found for this signature in database
GPG key ID: CB41AB0B8BE742BE
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Cargo.lock generated
View file

@ -154,6 +154,12 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "arrayvec"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"
[[package]] [[package]]
name = "ash" name = "ash"
version = "0.31.0" version = "0.31.0"
@ -6780,11 +6786,11 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
[[package]] [[package]]
name = "uluru" name = "uluru"
version = "0.4.0" version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d7b39d0c32eba57d52d334e4bdd150df6e755264eefaa1ae2e7cd125f35e1ca" checksum = "ce7967da538013500fa504ce61af688d6a310e6dea6985c71f3c6be37e2a55c7"
dependencies = [ dependencies = [
"arrayvec 0.5.1", "arrayvec 0.7.1",
] ]
[[package]] [[package]]

2
components/style/Cargo.toml
View file

@ -74,7 +74,7 @@ thin-slice = { version = "0.1.0", optional = true }
time = "0.1" time = "0.1"
to_shmem = { path = "../to_shmem" } to_shmem = { path = "../to_shmem" }
to_shmem_derive = { path = "../to_shmem_derive" } to_shmem_derive = { path = "../to_shmem_derive" }
uluru = "0.4" uluru = "2"
unicode-bidi = "0.3" unicode-bidi = "0.3"
unicode-segmentation = "1.0" unicode-segmentation = "1.0"
void = "1.0.2" void = "1.0.2"

6
components/style/context.rs
View file

@ -42,7 +42,7 @@ use style_traits::DevicePixel;
#[cfg(feature = "servo")] #[cfg(feature = "servo")]
use style_traits::SpeculativePainter; use style_traits::SpeculativePainter;
use time; use time;
use uluru::{Entry, LRUCache}; use uluru::LRUCache;
pub use selectors::matching::QuirksMode; pub use selectors::matching::QuirksMode;
@ -542,7 +542,7 @@ pub struct SelectorFlagsMap<E: TElement> {
map: FxHashMap<SendElement<E>, ElementSelectorFlags>, map: FxHashMap<SendElement<E>, ElementSelectorFlags>,
/// An LRU cache to avoid hashmap lookups, which can be slow if the map /// An LRU cache to avoid hashmap lookups, which can be slow if the map
/// gets big. /// gets big.
cache: LRUCache<[Entry<CacheItem<E>>; 4 + 1]>, cache: LRUCache<CacheItem<E>, { 4 + 1 }>,
} }
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
@ -583,7 +583,7 @@ impl<E: TElement> SelectorFlagsMap<E> {
/// Applies the flags. Must be called on the main thread. /// Applies the flags. Must be called on the main thread.
fn apply_flags(&mut self) { fn apply_flags(&mut self) {
debug_assert_eq!(thread_state::get(), ThreadState::LAYOUT); debug_assert_eq!(thread_state::get(), ThreadState::LAYOUT);
self.cache.evict_all(); self.cache.clear();
for (el, flags) in self.map.drain() { for (el, flags) in self.map.drain() {
unsafe { unsafe {
el.set_selector_flags(flags); el.set_selector_flags(flags);

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

@ -85,7 +85,7 @@ use std::marker::PhantomData;
use std::mem::{self, ManuallyDrop}; use std::mem::{self, ManuallyDrop};
use std::ops::Deref; use std::ops::Deref;
use std::ptr::NonNull; use std::ptr::NonNull;
use uluru::{Entry, LRUCache}; use uluru::LRUCache;
mod checks; mod checks;
@ -457,7 +457,7 @@ impl<E: TElement> StyleSharingTarget<E> {
} }
struct SharingCacheBase<Candidate> { struct SharingCacheBase<Candidate> {
entries: LRUCache<[Entry<Candidate>; SHARING_CACHE_SIZE]>, entries: LRUCache<Candidate, SHARING_CACHE_SIZE>,
} }
impl<Candidate> Default for SharingCacheBase<Candidate> { impl<Candidate> Default for SharingCacheBase<Candidate> {
@ -470,11 +470,11 @@ impl<Candidate> Default for SharingCacheBase<Candidate> {
impl<Candidate> SharingCacheBase<Candidate> { impl<Candidate> SharingCacheBase<Candidate> {
fn clear(&mut self) { fn clear(&mut self) {
self.entries.evict_all(); self.entries.clear();
} }
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.entries.num_entries() == 0 self.entries.len() == 0
} }
} }