Backed out changeset e2f8c9f76b71 for Hazard failure. r=backout
Backed out changeset e2f8c9f76b71 for Hazard failure. r=backout
--- a/servo/components/style/gecko/generated/bindings.rs
+++ b/servo/components/style/gecko/generated/bindings.rs
@@ -996,20 +996,16 @@ extern "C" {
}
extern "C" {
pub fn Gecko_ReleaseImageValueArbitraryThread(aPtr: *mut ImageValue);
}
extern "C" {
pub fn Gecko_ImageValue_Create(aURI: ServoBundledURI) -> *mut ImageValue;
}
extern "C" {
- pub fn Gecko_ImageValue_SizeOfIncludingThis(aImageValue: *mut ImageValue)
- -> usize;
-}
-extern "C" {
pub fn Gecko_SetLayerImageImageValue(image: *mut nsStyleImage,
aImageValue: *mut ImageValue);
}
extern "C" {
pub fn Gecko_SetImageElement(image: *mut nsStyleImage,
atom: *mut nsIAtom);
}
extern "C" {
--- a/servo/components/style/gecko/url.rs
+++ b/servo/components/style/gecko/url.rs
@@ -4,36 +4,38 @@
//! Common handling for the specified value CSS url() values.
use gecko_bindings::structs::{ServoBundledURI, URLExtraData};
use gecko_bindings::structs::mozilla::css::URLValueData;
use gecko_bindings::structs::root::mozilla::css::ImageValue;
use gecko_bindings::structs::root::nsStyleImageRequest;
use gecko_bindings::sugar::refptr::RefPtr;
-use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use parser::ParserContext;
use servo_arc::Arc;
use std::fmt;
use style_traits::{ToCss, ParseError};
/// A specified url() value for gecko. Gecko does not eagerly resolve SpecifiedUrls.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq)]
pub struct SpecifiedUrl {
/// The URL in unresolved string form.
///
/// Refcounted since cloning this should be cheap and data: uris can be
/// really large.
+ #[ignore_malloc_size_of = "XXX: do this once bug 1397971 lands"]
serialization: Arc<String>,
/// The URL extra data.
+ #[ignore_malloc_size_of = "RefPtr is tricky, and there aren't many of these in practise"]
pub extra_data: RefPtr<URLExtraData>,
/// Cache ImageValue, if any, so that we can reuse it while rematching a
/// a property with this specified url value.
+ #[ignore_malloc_size_of = "XXX: do this once bug 1397971 lands"]
pub image_value: Option<RefPtr<ImageValue>>,
}
trivial_to_computed_value!(SpecifiedUrl);
impl SpecifiedUrl {
/// Try to parse a URL from a string value that is a valid CSS token for a
/// URL.
///
@@ -126,30 +128,8 @@ impl SpecifiedUrl {
impl ToCss for SpecifiedUrl {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
dest.write_str("url(")?;
self.serialization.to_css(dest)?;
dest.write_str(")")
}
}
-
-impl MallocSizeOf for SpecifiedUrl {
- fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
- use gecko_bindings::bindings::Gecko_ImageValue_SizeOfIncludingThis;
-
- let mut n = 0;
-
- // XXX: measure `serialization` once bug 1397971 lands
-
- // We ignore `extra_data`, because RefPtr is tricky, and there aren't
- // many of them in practise (sharing is common).
-
- if let Some(ref image_value) = self.image_value {
- // Although this is a RefPtr, this is the primary reference because
- // SpecifiedUrl is responsible for creating the image_value. So we
- // measure unconditionally here.
- n += unsafe { Gecko_ImageValue_SizeOfIncludingThis(image_value.clone().get()) };
- }
-
- n
- }
-}