Skip to content

Commit

Permalink
Measure PropertyDeclaration better.
Browse files Browse the repository at this point in the history
This increases the style-sheets counts for gmail by about 30 MiB.
  • Loading branch information
nnethercote committed Sep 8, 2017
1 parent 54cd23a commit 0ee32cc
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions components/style/properties/properties.mako.rs
Expand Up @@ -38,7 +38,8 @@ use selectors::parser::SelectorParseError;
use shared_lock::StylesheetGuards;
use style_traits::{PARSING_MODE_DEFAULT, ToCss, ParseError};
use style_traits::{PropertyDeclarationParseError, StyleParseError, ValueParseError};
use stylesheets::{CssRuleType, MallocSizeOf, MallocSizeOfFn, Origin, UrlExtraData};
use stylesheets::{CssRuleType, MallocSizeOf, MallocSizeOfBox, MallocSizeOfFn, MallocSizeOfVec};
use stylesheets::{Origin, UrlExtraData};
#[cfg(feature = "servo")] use values::Either;
use values::generics::text::LineHeight;
use values::computed;
Expand Down Expand Up @@ -1328,10 +1329,26 @@ impl ToCss for PropertyDeclaration {
}

impl MallocSizeOf for PropertyDeclaration {
fn malloc_size_of_children(&self, _malloc_size_of: MallocSizeOfFn) -> usize {
// The variants of PropertyDeclaration mostly (entirely?) contain
// scalars, so this is reasonable.
0
fn malloc_size_of_children(&self, malloc_size_of: MallocSizeOfFn) -> usize {
match *self {
% for property in data.longhands:
% if property.boxed and property.is_vector:
<% raise Exception("this should not happen! not smart to box a vector here") %>
% elif property.boxed:
PropertyDeclaration::${property.camel_case}(ref sv_box) => {
sv_box.malloc_shallow_size_of_box(malloc_size_of)
}
% elif property.is_vector:
PropertyDeclaration::${property.camel_case}(ref sv_vec) => {
sv_vec.0.malloc_shallow_size_of_vec(malloc_size_of)
}
% endif
% endfor
PropertyDeclaration::CSSWideKeyword(..) => 0,
PropertyDeclaration::WithVariables(..) => 0,
PropertyDeclaration::Custom(..) => 0,
_ => 0,
}
}
}

Expand Down

0 comments on commit 0ee32cc

Please sign in to comment.