9ff046fd76
http://www.robohornet.org gives a score of 101.36 on master, and 102.68 with this PR. The latter is slightly better, but probably within noise level. So it looks like this PR does not affect DOM performance. This is expected since `Box::new` is defined as: ```rust impl<T> Box<T> { #[inline(always)] pub fn new(x: T) -> Box<T> { box x } } ``` With inlining, it should compile to the same as box syntax. Source-Repo: https://github.com/servo/servo Source-Revision: a9022be0c3e30249845ca5947ac0c0a6743c7991
93 lines
3.5 KiB
Rust
93 lines
3.5 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::StylePropertyMapReadOnlyBinding::StylePropertyMapReadOnlyMethods;
|
|
use dom::bindings::codegen::Bindings::StylePropertyMapReadOnlyBinding::Wrap;
|
|
use dom::bindings::reflector::Reflector;
|
|
use dom::bindings::reflector::reflect_dom_object;
|
|
use dom::bindings::root::{Dom, DomRoot};
|
|
use dom::bindings::str::DOMString;
|
|
use dom::cssstylevalue::CSSStyleValue;
|
|
use dom::globalscope::GlobalScope;
|
|
use dom_struct::dom_struct;
|
|
use servo_atoms::Atom;
|
|
use std::cmp::Ordering;
|
|
use std::collections::HashMap;
|
|
use std::iter::Iterator;
|
|
use style::custom_properties;
|
|
|
|
#[dom_struct]
|
|
pub struct StylePropertyMapReadOnly {
|
|
reflector: Reflector,
|
|
entries: HashMap<Atom, Dom<CSSStyleValue>>,
|
|
}
|
|
|
|
impl StylePropertyMapReadOnly {
|
|
fn new_inherited<Entries>(entries: Entries) -> StylePropertyMapReadOnly where
|
|
Entries: IntoIterator<Item=(Atom, Dom<CSSStyleValue>)>
|
|
{
|
|
StylePropertyMapReadOnly {
|
|
reflector: Reflector::new(),
|
|
entries: entries.into_iter().collect(),
|
|
}
|
|
}
|
|
|
|
pub fn from_iter<Entries>(global: &GlobalScope, entries: Entries) -> DomRoot<StylePropertyMapReadOnly> where
|
|
Entries: IntoIterator<Item=(Atom, String)>,
|
|
{
|
|
let mut keys = Vec::new();
|
|
rooted_vec!(let mut values);
|
|
let iter = entries.into_iter();
|
|
let (lo, _) = iter.size_hint();
|
|
keys.reserve(lo);
|
|
values.reserve(lo);
|
|
for (key, value) in iter {
|
|
let value = CSSStyleValue::new(global, value);
|
|
keys.push(key);
|
|
values.push(Dom::from_ref(&*value));
|
|
}
|
|
let iter = keys.drain(..).zip(values.iter().cloned());
|
|
reflect_dom_object(Box::new(StylePropertyMapReadOnly::new_inherited(iter)), global, Wrap)
|
|
}
|
|
}
|
|
|
|
impl StylePropertyMapReadOnlyMethods for StylePropertyMapReadOnly {
|
|
/// https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymapreadonly-get
|
|
fn Get(&self, property: DOMString) -> Option<DomRoot<CSSStyleValue>> {
|
|
// TODO: avoid constructing an Atom
|
|
self.entries.get(&Atom::from(property)).map(|value| DomRoot::from_ref(&**value))
|
|
}
|
|
|
|
/// https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymapreadonly-has
|
|
fn Has(&self, property: DOMString) -> bool {
|
|
// TODO: avoid constructing an Atom
|
|
self.entries.contains_key(&Atom::from(property))
|
|
}
|
|
|
|
/// https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymapreadonly-getproperties
|
|
fn GetProperties(&self) -> Vec<DOMString> {
|
|
let mut result: Vec<DOMString> = self.entries.keys()
|
|
.map(|key| DOMString::from(&**key))
|
|
.collect();
|
|
// https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-getproperties
|
|
// requires this sort order
|
|
result.sort_by(|key1, key2| {
|
|
if let Ok(key1) = custom_properties::parse_name(key1) {
|
|
if let Ok(key2) = custom_properties::parse_name(key2) {
|
|
key1.cmp(key2)
|
|
} else {
|
|
Ordering::Greater
|
|
}
|
|
} else {
|
|
if let Ok(_) = custom_properties::parse_name(key2) {
|
|
Ordering::Less
|
|
} else {
|
|
key1.cmp(key2)
|
|
}
|
|
}
|
|
});
|
|
result
|
|
}
|
|
}
|