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

style: Speed up LonghandId::is_longhand_of.

Browse source 
By looking at the shorthands, not the other way around, given a longhand uses to
not appear in multiple longhands.

This makes the testcase go to 430ms on my machine.

This could be even faster having a static LonghandIdSet per shorthand, I guess,
but this is not done in this PR.
This commit is contained in:
Emilio Cobos Álvarez 2017-06-14 12:55:50 +02:00
parent 6e85601858
commit 5fbaf6da5f
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

77
components/style/properties/properties.mako.rs
View file

@ -551,6 +551,42 @@ impl LonghandId {
} }
} }
fn shorthands(&self) -> &'static [ShorthandId] {
// first generate longhand to shorthands lookup map
//
// NOTE(emilio): This currently doesn't exclude the "all" shorthand. It
// could potentially do so, which would speed up serialization
// algorithms and what not, I guess.
<%
longhand_to_shorthand_map = {}
for shorthand in data.shorthands:
for sub_property in shorthand.sub_properties:
if sub_property.ident not in longhand_to_shorthand_map:
longhand_to_shorthand_map[sub_property.ident] = []
longhand_to_shorthand_map[sub_property.ident].append(shorthand.camel_case)
for shorthand_list in longhand_to_shorthand_map.itervalues():
shorthand_list.sort()
%>
// based on lookup results for each longhand, create result arrays
% for property in data.longhands:
static ${property.ident.upper()}: &'static [ShorthandId] = &[
% for shorthand in longhand_to_shorthand_map.get(property.ident, []):
ShorthandId::${shorthand},
% endfor
];
% endfor
match *self {
% for property in data.longhands:
LonghandId::${property.camel_case} => ${property.ident.upper()},
% endfor
}
}
/// If this is a logical property, return the corresponding physical one in the given writing mode. /// If this is a logical property, return the corresponding physical one in the given writing mode.
/// Otherwise, return unchanged. /// Otherwise, return unchanged.
pub fn to_physical(&self, wm: WritingMode) -> Self { pub fn to_physical(&self, wm: WritingMode) -> Self {
@ -885,7 +921,7 @@ impl<'a> PropertyDeclarationId<'a> {
PropertyDeclarationId::Longhand(id) => { PropertyDeclarationId::Longhand(id) => {
match *other { match *other {
PropertyId::Longhand(other_id) => id == other_id, PropertyId::Longhand(other_id) => id == other_id,
PropertyId::Shorthand(shorthand) => shorthand.longhands().contains(&id), PropertyId::Shorthand(shorthand) => self.is_longhand_of(shorthand),
PropertyId::Custom(_) => false, PropertyId::Custom(_) => false,
} }
} }
@ -899,7 +935,7 @@ impl<'a> PropertyDeclarationId<'a> {
/// shorthand. /// shorthand.
pub fn is_longhand_of(&self, shorthand: ShorthandId) -> bool { pub fn is_longhand_of(&self, shorthand: ShorthandId) -> bool {
match *self { match *self {
PropertyDeclarationId::Longhand(ref id) => shorthand.longhands().contains(id), PropertyDeclarationId::Longhand(ref id) => id.shorthands().contains(&shorthand),
_ => false, _ => false,
} }
} }
@ -1308,40 +1344,9 @@ impl PropertyDeclaration {
/// The shorthands that this longhand is part of. /// The shorthands that this longhand is part of.
pub fn shorthands(&self) -> &'static [ShorthandId] { pub fn shorthands(&self) -> &'static [ShorthandId] {
// first generate longhand to shorthands lookup map match self.id() {
<% PropertyDeclarationId::Longhand(id) => id.shorthands(),
longhand_to_shorthand_map = {} PropertyDeclarationId::Custom(..) => &[],
for shorthand in data.shorthands:
for sub_property in shorthand.sub_properties:
if sub_property.ident not in longhand_to_shorthand_map:
longhand_to_shorthand_map[sub_property.ident] = []
longhand_to_shorthand_map[sub_property.ident].append(shorthand.camel_case)
for shorthand_list in longhand_to_shorthand_map.itervalues():
shorthand_list.sort()
%>
// based on lookup results for each longhand, create result arrays
% for property in data.longhands:
static ${property.ident.upper()}: &'static [ShorthandId] = &[
% for shorthand in longhand_to_shorthand_map.get(property.ident, []):
ShorthandId::${shorthand},
% endfor
];
% endfor
match *self {
% for property in data.longhands:
PropertyDeclaration::${property.camel_case}(_) => ${property.ident.upper()},
% endfor
PropertyDeclaration::CSSWideKeyword(id, _) |
PropertyDeclaration::WithVariables(id, _) => match id {
% for property in data.longhands:
LonghandId::${property.camel_case} => ${property.ident.upper()},
% endfor
},
PropertyDeclaration::Custom(_, _) => &[]
} }
} }