Remove indirect mozjs dependency from compositing

This commit is contained in:
Anni Ryynänen 2018-02-04 17:42:46 +02:00
parent 8f24005e17
commit f5a9e16e07

View file

@ -56,9 +56,9 @@ extern crate smallbitvec;
extern crate smallvec; extern crate smallvec;
#[cfg(feature = "servo")] #[cfg(feature = "servo")]
extern crate string_cache; extern crate string_cache;
#[cfg(feature = "servo")] #[cfg(feature = "url")]
extern crate url; extern crate url;
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
extern crate webrender_api; extern crate webrender_api;
#[cfg(feature = "servo")] #[cfg(feature = "servo")]
extern crate xml5ever; extern crate xml5ever;
@ -803,7 +803,7 @@ malloc_size_of_is_0!(app_units::Au);
malloc_size_of_is_0!(cssparser::RGBA, cssparser::TokenSerializationType); malloc_size_of_is_0!(cssparser::RGBA, cssparser::TokenSerializationType);
#[cfg(feature = "servo")] #[cfg(feature = "url")]
impl MallocSizeOf for url::Host { impl MallocSizeOf for url::Host {
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
match *self { match *self {
@ -812,49 +812,49 @@ impl MallocSizeOf for url::Host {
} }
} }
} }
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::BorderRadius); malloc_size_of_is_0!(webrender_api::BorderRadius);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::BorderStyle); malloc_size_of_is_0!(webrender_api::BorderStyle);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::BorderWidths); malloc_size_of_is_0!(webrender_api::BorderWidths);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::BoxShadowClipMode); malloc_size_of_is_0!(webrender_api::BoxShadowClipMode);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ClipAndScrollInfo); malloc_size_of_is_0!(webrender_api::ClipAndScrollInfo);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ColorF); malloc_size_of_is_0!(webrender_api::ColorF);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ExtendMode); malloc_size_of_is_0!(webrender_api::ExtendMode);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::FilterOp); malloc_size_of_is_0!(webrender_api::FilterOp);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ExternalScrollId); malloc_size_of_is_0!(webrender_api::ExternalScrollId);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::GradientStop); malloc_size_of_is_0!(webrender_api::GradientStop);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ImageBorder); malloc_size_of_is_0!(webrender_api::ImageBorder);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ImageKey); malloc_size_of_is_0!(webrender_api::ImageKey);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ImageRendering); malloc_size_of_is_0!(webrender_api::ImageRendering);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::LineStyle); malloc_size_of_is_0!(webrender_api::LineStyle);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::LocalClip); malloc_size_of_is_0!(webrender_api::LocalClip);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::MixBlendMode); malloc_size_of_is_0!(webrender_api::MixBlendMode);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::NormalBorder); malloc_size_of_is_0!(webrender_api::NormalBorder);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::RepeatMode); malloc_size_of_is_0!(webrender_api::RepeatMode);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ScrollPolicy); malloc_size_of_is_0!(webrender_api::ScrollPolicy);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::ScrollSensitivity); malloc_size_of_is_0!(webrender_api::ScrollSensitivity);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::StickyOffsetBounds); malloc_size_of_is_0!(webrender_api::StickyOffsetBounds);
#[cfg(feature = "servo")] #[cfg(feature = "webrender_api")]
malloc_size_of_is_0!(webrender_api::TransformStyle); malloc_size_of_is_0!(webrender_api::TransformStyle);
#[cfg(feature = "servo")] #[cfg(feature = "servo")]