Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +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

22
components/layout/Cargo.toml
View file

@ -55,20 +55,22 @@ git = "https://github.com/servo/ipc-channel"
[dependencies]
app_units = {version = "0.2", features = ["plugins"]}
cssparser = { version = "0.5", features = [ "serde-serialization" ] }
log = "0.3"
fnv = "1.0"
bitflags = "0.3"
rustc-serialize = "0.3"
libc = "0.2"
selectors = "0.4.1"
smallvec = "0.1"
string_cache = "0.2"
cssparser = {version = "0.5.2", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.1", features = ["plugins"]}
fnv = "1.0"
heapsize = "0.2.5"
heapsize_plugin = "0.1.2"
libc = "0.2"
log = "0.3"
rustc-serialize = "0.3"
selectors = {version = "0.4.1", features = ["heap_size"]}
serde = "0.6"
serde_macros = "0.6"
serde_json = "0.5"
serde_macros = "0.6"
smallvec = "0.1"
string_cache = {version = "0.2.7", features = ["heap_size"]}
time = "0.1"
unicode-bidi = "0.2"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = "0.5.4"
url = {version = "0.5.4", features = ["heap_size"]}

2
components/layout/context.rs
View file

@ -14,6 +14,7 @@ use fnv::FnvHasher;
use gfx::font_cache_thread::FontCacheThread;
use gfx::font_context::FontContext;
use gfx_traits::LayerId;
use heapsize::HeapSizeOf;
use ipc_channel::ipc::{self, IpcSender};
use net_traits::image::base::Image;
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread, ImageResponse, ImageState};
@ -27,7 +28,6 @@ use std::sync::{Arc, Mutex};
use style::context::{LocalStyleContext, SharedStyleContext, StyleContext};
use style::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache};
use url::Url;
use util::mem::HeapSizeOf;
use util::opts;
struct LocalLayoutContext {

2
components/layout/layout_thread.rs
View file

@ -28,6 +28,7 @@ use gfx::font_cache_thread::FontCacheThread;
use gfx::font_context;
use gfx::paint_thread::{LayoutToPaintMsg, PaintLayer};
use gfx_traits::{color, Epoch, LayerId, ScrollPolicy};
use heapsize::HeapSizeOf;
use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAINT};
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
@ -73,7 +74,6 @@ use url::Url;
use util::geometry::MAX_RECT;
use util::ipc::OptionalIpcSender;
use util::logical_geometry::LogicalPoint;
use util::mem::HeapSizeOf;
use util::opts;
use util::thread;
use util::thread_state;

2
components/layout/lib.rs
View file

@ -17,6 +17,7 @@
#![deny(unsafe_code)]
#![plugin(heapsize_plugin)]
#![plugin(plugins)]
extern crate app_units;
@ -30,6 +31,7 @@ extern crate euclid;
extern crate fnv;
extern crate gfx;
extern crate gfx_traits;
extern crate heapsize;
extern crate ipc_channel;
extern crate layout_traits;
extern crate libc;