diff options
Diffstat (limited to 'components/script/dom/servoparser')
| -rw-r--r-- | components/script/dom/servoparser/async_html.rs | 30 | ||||
| -rw-r--r-- | components/script/dom/servoparser/html.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/servoparser/mod.rs | 12 | ||||
| -rw-r--r-- | components/script/dom/servoparser/xml.rs | 4 |
4 files changed, 25 insertions, 25 deletions
diff --git a/components/script/dom/servoparser/async_html.rs b/components/script/dom/servoparser/async_html.rs index 2c4e71047b5..bbfa1da0a93 100644 --- a/components/script/dom/servoparser/async_html.rs +++ b/components/script/dom/servoparser/async_html.rs @@ -38,25 +38,25 @@ use style::context::QuirksMode as ServoQuirksMode; type ParseNodeId = usize; -#[derive(Clone, HeapSizeOf, JSTraceable)] +#[derive(Clone, JSTraceable, MallocSizeOf)] pub struct ParseNode { id: ParseNodeId, qual_name: Option<QualName>, } -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] enum NodeOrText { Node(ParseNode), Text(String), } -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] struct Attribute { name: QualName, value: String, } -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] enum ParseOperation { GetTemplateContents { target: ParseNodeId, contents: ParseNodeId }, @@ -99,21 +99,21 @@ enum ParseOperation { Pop { node: ParseNodeId }, SetQuirksMode { - #[ignore_heap_size_of = "Defined in style"] + #[ignore_malloc_size_of = "Defined in style"] mode: ServoQuirksMode }, } -#[derive(HeapSizeOf)] +#[derive(MallocSizeOf)] enum ToTokenizerMsg { // From HtmlTokenizer TokenizerResultDone { - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] updated_input: VecDeque<SendTendril<UTF8>> }, TokenizerResultScript { script: ParseNode, - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] updated_input: VecDeque<SendTendril<UTF8>> }, End, // Sent to Tokenizer to signify HtmlTokenizer's end method has returned @@ -122,10 +122,10 @@ enum ToTokenizerMsg { ProcessOperation(ParseOperation), } -#[derive(HeapSizeOf)] +#[derive(MallocSizeOf)] enum ToHtmlTokenizerMsg { Feed { - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] input: VecDeque<SendTendril<UTF8>> }, End, @@ -165,15 +165,15 @@ fn create_buffer_queue(mut buffers: VecDeque<SendTendril<UTF8>>) -> BufferQueue // | | | |________| | // |_____________| |_______________| // -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] #[must_root] pub struct Tokenizer { document: Dom<Document>, - #[ignore_heap_size_of = "Defined in std"] + #[ignore_malloc_size_of = "Defined in std"] receiver: Receiver<ToTokenizerMsg>, - #[ignore_heap_size_of = "Defined in std"] + #[ignore_malloc_size_of = "Defined in std"] html_tokenizer_sender: Sender<ToHtmlTokenizerMsg>, - #[ignore_heap_size_of = "Defined in std"] + #[ignore_malloc_size_of = "Defined in std"] nodes: HashMap<ParseNodeId, Dom<Node>>, url: ServoUrl, } @@ -495,7 +495,7 @@ fn run(sink: Sink, } } -#[derive(Default, HeapSizeOf, JSTraceable)] +#[derive(Default, JSTraceable, MallocSizeOf)] struct ParseNodeData { contents: Option<ParseNode>, is_integration_point: bool, diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs index f6857fcd198..53dcc3fc7c6 100644 --- a/components/script/dom/servoparser/html.rs +++ b/components/script/dom/servoparser/html.rs @@ -28,10 +28,10 @@ use js::jsapi::JSTracer; use servo_url::ServoUrl; use std::io; -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] #[must_root] pub struct Tokenizer { - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] inner: HtmlTokenizer<TreeBuilder<Dom<Node>, Sink>>, } diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs index f5f7943693e..08310326716 100644 --- a/components/script/dom/servoparser/mod.rs +++ b/components/script/dom/servoparser/mod.rs @@ -74,13 +74,13 @@ pub struct ServoParser { /// The document associated with this parser. document: Dom<Document>, /// Input received from network. - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] network_input: DomRefCell<BufferQueue>, /// Part of an UTF-8 code point spanning input chunks - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] incomplete_utf8: DomRefCell<Option<IncompleteUtf8>>, /// Input received from script. Used only to support document.write(). - #[ignore_heap_size_of = "Defined in html5ever"] + #[ignore_malloc_size_of = "Defined in html5ever"] script_input: DomRefCell<BufferQueue>, /// The tokenizer of this parser. tokenizer: DomRefCell<Tokenizer>, @@ -493,13 +493,13 @@ impl<I> Iterator for FragmentParsingResult<I> } } -#[derive(HeapSizeOf, JSTraceable, PartialEq)] +#[derive(JSTraceable, MallocSizeOf, PartialEq)] enum ParserKind { Normal, ScriptCreated, } -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] #[must_root] enum Tokenizer { Html(self::html::Tokenizer), @@ -742,7 +742,7 @@ fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<Dom<N } } -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] #[must_root] pub struct Sink { base_url: ServoUrl, diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs index fe74d627349..d34792b56c3 100644 --- a/components/script/dom/servoparser/xml.rs +++ b/components/script/dom/servoparser/xml.rs @@ -16,10 +16,10 @@ use xml5ever::buffer_queue::BufferQueue; use xml5ever::tokenizer::XmlTokenizer; use xml5ever::tree_builder::{Tracer as XmlTracer, XmlTreeBuilder}; -#[derive(HeapSizeOf, JSTraceable)] +#[derive(JSTraceable, MallocSizeOf)] #[must_root] pub struct Tokenizer { - #[ignore_heap_size_of = "Defined in xml5ever"] + #[ignore_malloc_size_of = "Defined in xml5ever"] inner: XmlTokenizer<XmlTreeBuilder<Dom<Node>, Sink>>, } |