aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/servoparser/xml.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/servoparser/xml.rs')
-rw-r--r--components/script/dom/servoparser/xml.rs189
1 files changed, 31 insertions, 158 deletions
diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs
index 1ef5f882db0..ac900d61ce0 100644
--- a/components/script/dom/servoparser/xml.rs
+++ b/components/script/dom/servoparser/xml.rs
@@ -1,69 +1,48 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
#![allow(unrooted_must_root)]
-use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
-use dom::bindings::inheritance::Castable;
-use dom::bindings::js::{JS, MutNullableJS, Root};
-use dom::bindings::str::DOMString;
-use dom::bindings::trace::JSTraceable;
-use dom::comment::Comment;
-use dom::document::Document;
-use dom::documenttype::DocumentType;
-use dom::element::{Element, ElementCreator};
-use dom::htmlscriptelement::HTMLScriptElement;
-use dom::node::Node;
-use dom::processinginstruction::ProcessingInstruction;
-use dom::virtualmethods::vtable_for;
-use html5ever::tokenizer::buffer_queue::BufferQueue;
-use html5ever::tree_builder::{NodeOrText as H5eNodeOrText};
-use html5ever_atoms::{Prefix, QualName};
+use crate::dom::bindings::root::{Dom, DomRoot};
+use crate::dom::bindings::trace::JSTraceable;
+use crate::dom::document::Document;
+use crate::dom::htmlscriptelement::HTMLScriptElement;
+use crate::dom::node::Node;
+use crate::dom::servoparser::{ParsingAlgorithm, Sink};
use js::jsapi::JSTracer;
use servo_url::ServoUrl;
-use std::borrow::Cow;
-use xml5ever::tendril::StrTendril;
-use xml5ever::tokenizer::{Attribute, QName, XmlTokenizer};
-use xml5ever::tree_builder::{NextParserState, NodeOrText};
-use xml5ever::tree_builder::{Tracer as XmlTracer, TreeSink, XmlTreeBuilder};
+use xml5ever::buffer_queue::BufferQueue;
+use xml5ever::tokenizer::XmlTokenizer;
+use xml5ever::tree_builder::{Tracer as XmlTracer, XmlTreeBuilder};
-#[derive(HeapSizeOf, JSTraceable)]
-#[must_root]
+#[derive(JSTraceable, MallocSizeOf)]
+#[unrooted_must_root_lint::must_root]
pub struct Tokenizer {
- #[ignore_heap_size_of = "Defined in xml5ever"]
- inner: XmlTokenizer<XmlTreeBuilder<JS<Node>, Sink>>,
+ #[ignore_malloc_size_of = "Defined in xml5ever"]
+ inner: XmlTokenizer<XmlTreeBuilder<Dom<Node>, Sink>>,
}
impl Tokenizer {
pub fn new(document: &Document, url: ServoUrl) -> Self {
let sink = Sink {
base_url: url,
- document: JS::from_ref(document),
+ document: Dom::from_ref(document),
+ current_line: 1,
script: Default::default(),
+ parsing_algorithm: ParsingAlgorithm::Normal,
};
let tb = XmlTreeBuilder::new(sink, Default::default());
let tok = XmlTokenizer::new(tb, Default::default());
- Tokenizer {
- inner: tok,
- }
+ Tokenizer { inner: tok }
}
- pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), Root<HTMLScriptElement>> {
- if !input.is_empty() {
- while let Some(chunk) = input.pop_front() {
- self.inner.feed(chunk);
- if let Some(script) = self.inner.sink().sink().script.take() {
- return Err(script);
- }
- }
- } else {
- self.inner.run();
- if let Some(script) = self.inner.sink().sink().script.take() {
- return Err(script);
- }
+ pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), DomRoot<HTMLScriptElement>> {
+ self.inner.run(input);
+ if let Some(script) = self.inner.sink.sink.script.take() {
+ return Err(script);
}
Ok(())
}
@@ -73,134 +52,28 @@ impl Tokenizer {
}
pub fn url(&self) -> &ServoUrl {
- &self.inner.sink().sink().base_url
+ &self.inner.sink.sink.base_url
}
}
#[allow(unsafe_code)]
-unsafe impl JSTraceable for XmlTokenizer<XmlTreeBuilder<JS<Node>, Sink>> {
+unsafe impl JSTraceable for XmlTokenizer<XmlTreeBuilder<Dom<Node>, Sink>> {
unsafe fn trace(&self, trc: *mut JSTracer) {
struct Tracer(*mut JSTracer);
let tracer = Tracer(trc);
impl XmlTracer for Tracer {
- type Handle = JS<Node>;
+ type Handle = Dom<Node>;
#[allow(unrooted_must_root)]
- fn trace_handle(&self, node: JS<Node>) {
- unsafe { node.trace(self.0); }
+ fn trace_handle(&self, node: &Dom<Node>) {
+ unsafe {
+ node.trace(self.0);
+ }
}
}
- let tree_builder = self.sink();
+ let tree_builder = &self.sink;
tree_builder.trace_handles(&tracer);
- tree_builder.sink().trace(trc);
- }
-}
-
-#[derive(JSTraceable, HeapSizeOf)]
-#[must_root]
-struct Sink {
- base_url: ServoUrl,
- document: JS<Document>,
- script: MutNullableJS<HTMLScriptElement>,
-}
-
-impl TreeSink for Sink {
- type Output = Self;
- type Handle = JS<Node>;
-
- fn finish(self) -> Self {
- self
- }
-
- fn parse_error(&mut self, msg: Cow<'static, str>) {
- debug!("Parse error: {}", msg);
- }
-
- fn get_document(&mut self) -> JS<Node> {
- JS::from_ref(self.document.upcast())
- }
-
- fn elem_name(&self, target: &JS<Node>) -> QName {
- let elem = target.downcast::<Element>()
- .expect("tried to get name of non-Element in XML parsing");
- QName {
- prefix: elem.prefix().map_or(namespace_prefix!(""), |p| Prefix::from(&**p)),
- namespace_url: elem.namespace().clone(),
- local: elem.local_name().clone(),
- }
- }
-
- fn create_element(&mut self, name: QName, attrs: Vec<Attribute>)
- -> JS<Node> {
- let prefix = if name.prefix == namespace_prefix!("") { None } else { Some(name.prefix) };
- let name = QualName {
- ns: name.namespace_url,
- local: name.local,
- };
- //TODO: Add ability to track lines to API of xml5ever
- let elem = Element::create(name, prefix, &*self.document,
- ElementCreator::ParserCreated(1));
-
- for attr in attrs {
- let name = QualName {
- ns: attr.name.namespace_url,
- local: attr.name.local,
- };
- elem.set_attribute_from_parser(name, DOMString::from(String::from(attr.value)), None);
- }
-
- JS::from_ref(elem.upcast())
- }
-
- fn create_comment(&mut self, text: StrTendril) -> JS<Node> {
- let comment = Comment::new(DOMString::from(String::from(text)), &*self.document);
- JS::from_ref(comment.upcast())
- }
-
- fn append(&mut self, parent: JS<Node>, child: NodeOrText<JS<Node>>) {
- let child = match child {
- NodeOrText::AppendNode(n) => H5eNodeOrText::AppendNode(n),
- NodeOrText::AppendText(s) => H5eNodeOrText::AppendText(s),
- };
- super::insert(&*parent, None, child);
- }
-
- fn append_doctype_to_document(&mut self, name: StrTendril, public_id: StrTendril,
- system_id: StrTendril) {
- let doc = &*self.document;
- let doctype = DocumentType::new(
- DOMString::from(String::from(name)), Some(DOMString::from(String::from(public_id))),
- Some(DOMString::from(String::from(system_id))), doc);
- doc.upcast::<Node>().AppendChild(doctype.upcast()).expect("Appending failed");
- }
-
- fn create_pi(&mut self, target: StrTendril, data: StrTendril) -> JS<Node> {
- let doc = &*self.document;
- let pi = ProcessingInstruction::new(
- DOMString::from(String::from(target)), DOMString::from(String::from(data)),
- doc);
- JS::from_ref(pi.upcast())
- }
-
- fn mark_script_already_started(&mut self, node: Self::Handle) {
- let script = node.downcast::<HTMLScriptElement>();
- if let Some(script) = script {
- script.set_already_started(true);
- }
- }
-
- fn complete_script(&mut self, node: Self::Handle) -> NextParserState {
- if let Some(script) = node.downcast() {
- self.script.set(Some(script));
- NextParserState::Suspend
- } else {
- NextParserState::Continue
- }
- }
-
- fn pop(&mut self, node: Self::Handle) {
- let node = Root::from_ref(&*node);
- vtable_for(&node).pop();
+ tree_builder.sink.trace(trc);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 21:30:55 +0000