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

Say farewell to in-tree HeapSizeOf

Browse source
This commit is contained in:
Anthony Ramine 2016-01-30 15:06:31 +01:00
parent 9932a5cf82
commit cb5cd8d881
80 changed files with 245 additions and 733 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/net_traits/Cargo.toml
View file

@ -20,11 +20,13 @@ git = "https://github.com/servo/ipc-channel"
path = "../plugins"
[dependencies]
heapsize = "0.2.5"
heapsize_plugin = "0.1.2"
hyper = { version = "0.7", features = [ "serde-serialization" ] }
image = "0.5.0"
log = "0.3"
serde = "0.6"
serde_macros = "0.6"
stb_image = "0.2"
url = "0.5.4"
url = {version = "0.5.4", features = ["heap_size"]}
websocket = "0.14.0"

1
components/net_traits/image_cache_thread.rs
View file

@ -6,7 +6,6 @@ use ipc_channel::ipc::{self, IpcSender};
use msg::constellation_msg::{Image, ImageMetadata};
use std::sync::Arc;
use url::Url;
use util::mem::HeapSizeOf;
/// This is optionally passed to the image cache when requesting
/// and image, and returned to the specified event loop when the

7
components/net_traits/lib.rs
View file

@ -9,8 +9,9 @@
#![feature(slice_patterns)]
#![feature(step_by)]
#![feature(custom_attribute)]
#![plugin(serde_macros, plugins)]
#![plugin(heapsize_plugin, serde_macros)]
extern crate heapsize;
extern crate hyper;
extern crate image as piston_image;
extern crate ipc_channel;
@ -32,7 +33,6 @@ use msg::constellation_msg::{PipelineId};
use serde::{Deserializer, Serializer};
use std::thread;
use url::Url;
use util::mem::HeapSizeOf;
use websocket::header;
pub mod hosts;
@ -69,6 +69,7 @@ pub enum LoadContext {
#[derive(Clone, Deserialize, Serialize, HeapSizeOf)]
pub struct LoadData {
pub url: Url,
#[ignore_heap_size_of = "Defined in hyper"]
pub method: Method,
#[ignore_heap_size_of = "Defined in hyper"]
/// Headers that will apply to the initial request only
@ -297,6 +298,7 @@ pub struct Metadata {
/// Final URL after redirects.
pub final_url: Url,
#[ignore_heap_size_of = "Defined in hyper"]
/// MIME type / subtype.
pub content_type: Option<(ContentType)>,
@ -307,6 +309,7 @@ pub struct Metadata {
/// Headers
pub headers: Option<Headers>,
#[ignore_heap_size_of = "Defined in hyper"]
/// HTTP Status
pub status: Option<RawStatus>,
}