aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/document.rs2
-rw-r--r--components/script/dom/servohtmlparser.rs174
-rw-r--r--components/script/dom/servoxmlparser.rs3
-rw-r--r--components/script/parse/mod.rs166
-rw-r--r--components/script/script_thread.rs3
5 files changed, 178 insertions, 170 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 7d25e484aa3..7e5cc5025f2 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -70,7 +70,6 @@ use dom::nodelist::NodeList;
use dom::processinginstruction::ProcessingInstruction;
use dom::progressevent::ProgressEvent;
use dom::range::Range;
-use dom::servohtmlparser::{ParserRoot, ParserRef, MutNullableParserField};
use dom::storageevent::StorageEvent;
use dom::stylesheetlist::StyleSheetList;
use dom::text::Text;
@@ -98,6 +97,7 @@ use net_traits::response::HttpsState;
use net_traits::{AsyncResponseTarget, PendingAsyncLoad};
use num_traits::ToPrimitive;
use origin::Origin;
+use parse::{ParserRoot, ParserRef, MutNullableParserField};
use script_runtime::ScriptChan;
use script_thread::{MainThreadScriptChan, MainThreadScriptMsg, Runnable};
use script_traits::UntrustedNodeAddress;
diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs
index 25fbff24d28..95fc19dbb25 100644
--- a/components/script/dom/servohtmlparser.rs
+++ b/components/script/dom/servohtmlparser.rs
@@ -15,7 +15,6 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::trace::JSTraceable;
use dom::document::Document;
use dom::node::Node;
-use dom::servoxmlparser::ServoXMLParser;
use dom::window::Window;
use encoding::all::UTF_8;
use encoding::types::{DecoderTrap, Encoding};
@@ -28,13 +27,11 @@ use js::jsapi::JSTracer;
use msg::constellation_msg::{PipelineId, SubpageId};
use net_traits::{AsyncResponseListener, Metadata, NetworkError};
use network_listener::PreInvoke;
-use parse::Parser;
+use parse::{TrustedParser, ParserRef, Parser};
use script_runtime::ScriptChan;
use script_thread::ScriptThread;
use std::cell::Cell;
-use std::cell::UnsafeCell;
use std::default::Default;
-use std::ptr;
use url::Url;
use util::resource_files::read_resource_file;
@@ -55,160 +52,6 @@ pub struct FragmentContext<'a> {
pub type Tokenizer = tokenizer::Tokenizer<TreeBuilder<JS<Node>, Sink>>;
-#[must_root]
-#[derive(JSTraceable, HeapSizeOf)]
-pub enum ParserField {
- HTML(JS<ServoHTMLParser>),
- XML(JS<ServoXMLParser>),
-}
-
-#[must_root]
-#[derive(JSTraceable, HeapSizeOf)]
-pub struct MutNullableParserField {
- #[ignore_heap_size_of = "XXXjdm"]
- ptr: UnsafeCell<Option<ParserField>>,
-}
-
-impl Default for MutNullableParserField {
- #[allow(unrooted_must_root)]
- fn default() -> MutNullableParserField {
- MutNullableParserField {
- ptr: UnsafeCell::new(None),
- }
- }
-}
-
-impl MutNullableParserField {
- #[allow(unsafe_code)]
- pub fn set(&self, val: Option<ParserRef>) {
- unsafe {
- *self.ptr.get() = val.map(|val| {
- match val {
- ParserRef::HTML(parser) => ParserField::HTML(JS::from_ref(parser)),
- ParserRef::XML(parser) => ParserField::XML(JS::from_ref(parser)),
- }
- });
- }
- }
-
- #[allow(unsafe_code, unrooted_must_root)]
- pub fn get(&self) -> Option<ParserRoot> {
- unsafe {
- ptr::read(self.ptr.get()).map(|o| {
- match o {
- ParserField::HTML(parser) => ParserRoot::HTML(Root::from_ref(&*parser)),
- ParserField::XML(parser) => ParserRoot::XML(Root::from_ref(&*parser)),
- }
- })
- }
- }
-}
-
-pub enum ParserRoot {
- HTML(Root<ServoHTMLParser>),
- XML(Root<ServoXMLParser>),
-}
-
-impl ParserRoot {
- pub fn r(&self) -> ParserRef {
- match *self {
- ParserRoot::HTML(ref parser) => ParserRef::HTML(parser.r()),
- ParserRoot::XML(ref parser) => ParserRef::XML(parser.r()),
- }
- }
-}
-
-enum TrustedParser {
- HTML(Trusted<ServoHTMLParser>),
- XML(Trusted<ServoXMLParser>),
-}
-
-impl TrustedParser {
- pub fn root(&self) -> ParserRoot {
- match *self {
- TrustedParser::HTML(ref parser) => ParserRoot::HTML(parser.root()),
- TrustedParser::XML(ref parser) => ParserRoot::XML(parser.root()),
- }
- }
-}
-
-pub enum ParserRef<'a> {
- HTML(&'a ServoHTMLParser),
- XML(&'a ServoXMLParser),
-}
-
-impl<'a> ParserRef<'a> {
- fn parse_chunk(&self, input: String) {
- match *self {
- ParserRef::HTML(parser) => parser.parse_chunk(input),
- ParserRef::XML(parser) => parser.parse_chunk(input),
- }
- }
-
- pub fn window(&self) -> &Window {
- match *self {
- ParserRef::HTML(parser) => parser.window(),
- ParserRef::XML(parser) => parser.window(),
- }
- }
-
- pub fn resume(&self) {
- match *self {
- ParserRef::HTML(parser) => parser.resume(),
- ParserRef::XML(parser) => parser.resume(),
- }
- }
-
- pub fn suspend(&self) {
- match *self {
- ParserRef::HTML(parser) => parser.suspend(),
- ParserRef::XML(parser) => parser.suspend(),
- }
- }
-
- pub fn is_suspended(&self) -> bool {
- match *self {
- ParserRef::HTML(parser) => parser.is_suspended(),
- ParserRef::XML(parser) => parser.is_suspended(),
- }
- }
-
- pub fn pending_input(&self) -> &DOMRefCell<Vec<String>> {
- match *self {
- ParserRef::HTML(parser) => parser.pending_input(),
- ParserRef::XML(parser) => parser.pending_input(),
- }
- }
-
- pub fn set_plaintext_state(&self) {
- match *self {
- ParserRef::HTML(parser) => parser.set_plaintext_state(),
- ParserRef::XML(parser) => parser.set_plaintext_state(),
- }
- }
-
- pub fn parse_sync(&self) {
- match *self {
- ParserRef::HTML(parser) => parser.parse_sync(),
- ParserRef::XML(parser) => parser.parse_sync(),
- }
- }
-
- pub fn document(&self) -> &Document {
- match *self {
- ParserRef::HTML(parser) => parser.document(),
- ParserRef::XML(parser) => parser.document(),
- }
- }
-
- pub fn last_chunk_received(&self) -> &Cell<bool> {
- match *self {
- ParserRef::HTML(parser) => parser.last_chunk_received(),
- ParserRef::XML(parser) => parser.last_chunk_received(),
- }
- }
-}
-
/// The context required for asynchronously fetching a document and parsing it progressively.
pub struct ParserContext {
/// The parser that initiated the request.
@@ -477,9 +320,8 @@ impl ServoHTMLParser {
}
-
impl ServoHTMLParser {
- fn parse_sync(&self) {
+ pub fn parse_sync(&self) {
// This parser will continue to parse while there is either pending input or
// the parser remains unsuspended.
loop {
@@ -507,30 +349,30 @@ impl ServoHTMLParser {
}
}
- fn window(&self) -> &Window {
+ pub fn window(&self) -> &Window {
self.document.window()
}
- fn suspend(&self) {
+ pub fn suspend(&self) {
assert!(!self.suspended.get());
self.suspended.set(true);
}
- fn resume(&self) {
+ pub fn resume(&self) {
assert!(self.suspended.get());
self.suspended.set(false);
self.parse_sync();
}
- fn is_suspended(&self) -> bool {
+ pub fn is_suspended(&self) -> bool {
self.suspended.get()
}
- fn document(&self) -> &Document {
+ pub fn document(&self) -> &Document {
&self.document
}
- fn last_chunk_received(&self) -> &Cell<bool> {
+ pub fn last_chunk_received(&self) -> &Cell<bool> {
&self.last_chunk_received
}
}
diff --git a/components/script/dom/servoxmlparser.rs b/components/script/dom/servoxmlparser.rs
index 6baa7e183ff..63e64a6fe4c 100644
--- a/components/script/dom/servoxmlparser.rs
+++ b/components/script/dom/servoxmlparser.rs
@@ -10,11 +10,10 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::trace::JSTraceable;
use dom::document::Document;
use dom::node::Node;
-use dom::servohtmlparser::ParserRef;
use dom::window::Window;
use js::jsapi::JSTracer;
use msg::constellation_msg::PipelineId;
-use parse::Parser;
+use parse::{Parser, ParserRef};
use script_thread::ScriptThread;
use std::cell::Cell;
use url::Url;
diff --git a/components/script/parse/mod.rs b/components/script/parse/mod.rs
index dc09d34853a..1f561df0e16 100644
--- a/components/script/parse/mod.rs
+++ b/components/script/parse/mod.rs
@@ -2,6 +2,17 @@
* 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/. */
+use dom::bindings::cell::DOMRefCell;
+use dom::bindings::js::{JS, Root};
+use dom::bindings::refcounted::Trusted;
+use dom::document::Document;
+use dom::servohtmlparser::ServoHTMLParser;
+use dom::servoxmlparser::ServoXMLParser;
+use dom::window::Window;
+use std::cell::Cell;
+use std::cell::UnsafeCell;
+use std::ptr;
+
pub mod html;
pub mod xml;
@@ -9,3 +20,158 @@ pub trait Parser {
fn parse_chunk(self, input: String);
fn finish(self);
}
+
+#[must_root]
+#[derive(JSTraceable, HeapSizeOf)]
+pub enum ParserField {
+ HTML(JS<ServoHTMLParser>),
+ XML(JS<ServoXMLParser>),
+}
+
+#[must_root]
+#[derive(JSTraceable, HeapSizeOf)]
+pub struct MutNullableParserField {
+ #[ignore_heap_size_of = "XXXjdm"]
+ ptr: UnsafeCell<Option<ParserField>>,
+}
+
+impl Default for MutNullableParserField {
+ #[allow(unrooted_must_root)]
+ fn default() -> MutNullableParserField {
+ MutNullableParserField {
+ ptr: UnsafeCell::new(None),
+ }
+ }
+}
+
+impl MutNullableParserField {
+ #[allow(unsafe_code)]
+ pub fn set(&self, val: Option<ParserRef>) {
+ unsafe {
+ *self.ptr.get() = val.map(|val| {
+ match val {
+ ParserRef::HTML(parser) => ParserField::HTML(JS::from_ref(parser)),
+ ParserRef::XML(parser) => ParserField::XML(JS::from_ref(parser)),
+ }
+ });
+ }
+ }
+
+ #[allow(unsafe_code, unrooted_must_root)]
+ pub fn get(&self) -> Option<ParserRoot> {
+ unsafe {
+ ptr::read(self.ptr.get()).map(|o| {
+ match o {
+ ParserField::HTML(parser) => ParserRoot::HTML(Root::from_ref(&*parser)),
+ ParserField::XML(parser) => ParserRoot::XML(Root::from_ref(&*parser)),
+ }
+ })
+ }
+ }
+}
+
+pub enum ParserRoot {
+ HTML(Root<ServoHTMLParser>),
+ XML(Root<ServoXMLParser>),
+}
+
+impl ParserRoot {
+ pub fn r(&self) -> ParserRef {
+ match *self {
+ ParserRoot::HTML(ref parser) => ParserRef::HTML(parser.r()),
+ ParserRoot::XML(ref parser) => ParserRef::XML(parser.r()),
+ }
+ }
+}
+
+pub enum TrustedParser {
+ HTML(Trusted<ServoHTMLParser>),
+ XML(Trusted<ServoXMLParser>),
+}
+
+impl TrustedParser {
+ pub fn root(&self) -> ParserRoot {
+ match *self {
+ TrustedParser::HTML(ref parser) => ParserRoot::HTML(parser.root()),
+ TrustedParser::XML(ref parser) => ParserRoot::XML(parser.root()),
+ }
+ }
+}
+
+pub enum ParserRef<'a> {
+ HTML(&'a ServoHTMLParser),
+ XML(&'a ServoXMLParser),
+}
+
+impl<'a> ParserRef<'a> {
+ pub fn parse_chunk(&self, input: String) {
+ match *self {
+ ParserRef::HTML(parser) => parser.parse_chunk(input),
+ ParserRef::XML(parser) => parser.parse_chunk(input),
+ }
+ }
+
+ pub fn window(&self) -> &Window {
+ match *self {
+ ParserRef::HTML(parser) => parser.window(),
+ ParserRef::XML(parser) => parser.window(),
+ }
+ }
+
+ pub fn resume(&self) {
+ match *self {
+ ParserRef::HTML(parser) => parser.resume(),
+ ParserRef::XML(parser) => parser.resume(),
+ }
+ }
+
+ pub fn suspend(&self) {
+ match *self {
+ ParserRef::HTML(parser) => parser.suspend(),
+ ParserRef::XML(parser) => parser.suspend(),
+ }
+ }
+
+ pub fn is_suspended(&self) -> bool {
+ match *self {
+ ParserRef::HTML(parser) => parser.is_suspended(),
+ ParserRef::XML(parser) => parser.is_suspended(),
+ }
+ }
+
+ pub fn pending_input(&self) -> &DOMRefCell<Vec<String>> {
+ match *self {
+ ParserRef::HTML(parser) => parser.pending_input(),
+ ParserRef::XML(parser) => parser.pending_input(),
+ }
+ }
+
+ pub fn set_plaintext_state(&self) {
+ match *self {
+ ParserRef::HTML(parser) => parser.set_plaintext_state(),
+ ParserRef::XML(parser) => parser.set_plaintext_state(),
+ }
+ }
+
+ pub fn parse_sync(&self) {
+ match *self {
+ ParserRef::HTML(parser) => parser.parse_sync(),
+ ParserRef::XML(parser) => parser.parse_sync(),
+ }
+ }
+
+ pub fn document(&self) -> &Document {
+ match *self {
+ ParserRef::HTML(parser) => parser.document(),
+ ParserRef::XML(parser) => parser.document(),
+ }
+ }
+
+ pub fn last_chunk_received(&self) -> &Cell<bool> {
+ match *self {
+ ParserRef::HTML(parser) => parser.last_chunk_received(),
+ ParserRef::XML(parser) => parser.last_chunk_received(),
+ }
+ }
+}
+
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index d21a0f6ce0d..a082c6bdaab 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -38,7 +38,7 @@ use dom::element::Element;
use dom::event::{Event, EventBubbles, EventCancelable};
use dom::htmlanchorelement::HTMLAnchorElement;
use dom::node::{Node, NodeDamage, window_from_node};
-use dom::servohtmlparser::{ParserContext, ParserRoot};
+use dom::servohtmlparser::ParserContext;
use dom::uievent::UIEvent;
use dom::window::{ReflowReason, ScriptHelpers, Window};
use dom::worker::TrustedWorkerAddress;
@@ -69,6 +69,7 @@ use net_traits::storage_thread::StorageThread;
use net_traits::{AsyncResponseTarget, ControlMsg, LoadConsumer, LoadContext, Metadata, ResourceThread};
use network_listener::NetworkListener;
use page::{Frame, IterablePage, Page};
+use parse::ParserRoot;
use parse::html::{ParseContext, parse_html};
use parse::xml::{self, parse_xml};
use profile_traits::mem::{self, OpaqueSender, Report, ReportKind, ReportsChan};
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 06:31:46 +0000