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: Avoid double hash lookup when inserting in OrderMap.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-02-05 03:18:28 +01:00
parent f2df3052d9
commit c72a5623b1
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/style/custom_properties.rs
View file

@ -8,6 +8,7 @@
use Atom; use Atom;
use cssparser::{Delimiter, Parser, ParserInput, SourcePosition, Token, TokenSerializationType}; use cssparser::{Delimiter, Parser, ParserInput, SourcePosition, Token, TokenSerializationType};
use hash::map::Entry;
use precomputed_hash::PrecomputedHash; use precomputed_hash::PrecomputedHash;
use properties::{CSSWideKeyword, DeclaredValue}; use properties::{CSSWideKeyword, DeclaredValue};
use selector_map::{PrecomputedHashSet, PrecomputedHashMap}; use selector_map::{PrecomputedHashSet, PrecomputedHashMap};
@ -105,11 +106,21 @@ where
} }
/// Insert a new key-value pair. /// Insert a new key-value pair.
///
/// TODO(emilio): Remove unused_mut when Gecko and Servo agree in whether
/// it's necessary.
#[allow(unused_mut)]
pub fn insert(&mut self, key: K, value: V) { pub fn insert(&mut self, key: K, value: V) {
if !self.values.contains_key(&key) { let OrderedMap { ref mut index, ref mut values } = *self;
self.index.push(key.clone()); match values.entry(key) {
Entry::Vacant(mut entry) => {
index.push(entry.key().clone());
entry.insert(value);
}
Entry::Occupied(mut entry) => {
entry.insert(value);
}
} }
self.values.insert(key, value);
} }
/// Get a value given its key. /// Get a value given its key.
@ -666,8 +677,6 @@ fn substitute_all(custom_properties_map: &mut CustomPropertiesMap) {
/// been completely resolved. /// been completely resolved.
/// * There is no such variable at all. /// * There is no such variable at all.
fn traverse<'a>(name: Name, context: &mut Context<'a>) -> Option<usize> { fn traverse<'a>(name: Name, context: &mut Context<'a>) -> Option<usize> {
use hash::map::Entry;
// Some shortcut checks. // Some shortcut checks.
let (name, value) = if let Some(value) = context.map.get(&name) { let (name, value) = if let Some(value) = context.map.get(&name) {
// This variable has been resolved. Return the signal value. // This variable has been resolved. Return the signal value.