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

Auto merge of #9532 - nox:dedup-heapsize, r=Manishearth

Browse source 
Say farewell to in-tree HeapSizeOf

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9532)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-05 03:40:36 +05:30
commit 2a6707ce58
82 changed files with 426 additions and 881 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/Cargo.toml
View file

@ -20,21 +20,23 @@ path = "../style_traits"
[dependencies]
app_units = {version = "0.2", features = ["plugins"]}
cssparser = { version = "0.5", features = [ "serde-serialization" ] }
cssparser = {version = "0.5.2", features = ["heap_size", "serde-serialization"]}
log = "0.3"
encoding = "0.2"
fnv = "1.0"
heapsize = "0.2.5"
heapsize_plugin = "0.1.2"
rustc-serialize = "0.3"
matches = "0.1"
bitflags = "0.3"
num = "0.1.24"
lazy_static = "0.1.10"
selectors = { version = "0.4.1", features = ["unstable"] }
selectors = {version = "0.4.1", features = ["heap_size", "unstable"]}
smallvec = "0.1"
string_cache = "0.2"
string_cache = {version = "0.2.7", features = ["heap_size"]}
euclid = {version = "0.6.1", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
time = "0.1"
url = "0.5.4"
url = {version = "0.5.4", features = ["heap_size"]}

1
components/style/custom_properties.rs
View file

@ -10,7 +10,6 @@ use std::collections::{HashMap, HashSet};
use std::fmt;
use std::sync::Arc;
use string_cache::Atom;
use util::mem::HeapSizeOf;
// Does not include the `--` prefix
pub type Name = Atom;

1
components/style/font_face.rs
View file

@ -8,7 +8,6 @@ use parser::{ParserContext, log_css_error};
use properties::longhands::font_family::parse_one_family;
use std::ascii::AsciiExt;
use url::Url;
use util::mem::HeapSizeOf;
#[derive(Clone, Debug, HeapSizeOf, PartialEq, Eq, Deserialize, Serialize)]
pub enum Source {

5
components/style/lib.rs
View file

@ -11,9 +11,9 @@
#![feature(custom_derive)]
#![feature(plugin)]
#![plugin(serde_macros)]
#![plugin(serde_macros)]
#![plugin(heapsize_plugin)]
#![plugin(plugins)]
#![plugin(serde_macros)]
#![recursion_limit = "500"] // For match_ignore_ascii_case in PropertyDeclaration::parse
@ -26,6 +26,7 @@ extern crate cssparser;
extern crate encoding;
extern crate euclid;
extern crate fnv;
extern crate heapsize;
#[macro_use]
extern crate lazy_static;
#[macro_use]

1
components/style/media_queries.rs
View file

@ -8,7 +8,6 @@ use euclid::size::{Size2D, TypedSize2D};
use properties::longhands;
use std::ascii::AsciiExt;
use util::geometry::ViewportPx;
use util::mem::HeapSizeOf;
use values::specified;

1
components/style/stylesheets.rs
View file

@ -19,7 +19,6 @@ use std::iter::Iterator;
use std::slice;
use string_cache::{Atom, Namespace};
use url::Url;
use util::mem::HeapSizeOf;
use viewport::ViewportRule;

1
components/style/viewport.rs
View file

@ -18,7 +18,6 @@ use std::str::Chars;
use style_traits::viewport::{Orientation, UserZoom, ViewportConstraints, Zoom};
use stylesheets::Origin;
use util::geometry::ViewportPx;
use util::mem::HeapSizeOf;
use values::computed::{Context, ToComputedValue};
use values::specified::{Length, LengthOrPercentageOrAuto, ViewportPercentageLength};