mirror of
https://github.com/servo/servo.git
synced 2025-06-12 18:34:39 +00:00
c831c2c0a5
Now that JSRef<T> is gone, there is no need to have helper traits.
On components/script/*.rs:
# Remove imports.
/^ *use dom::[a-z]+::\{.*Helpers/ {
s/\{(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers, /\{/
s/, (Raw[^L]|[^L][^a])[a-zA-Z]+Helpers([,}])/\2/g
s/\{([a-zA-Z]+)\}/\1/
/\{\}/d
s/::self;$/;/
}
/^ *use dom::[a-z]+::\{?(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers\}?;$/d
On components/script/dom/*.rs:
# Ignore layout things.
/^(pub )?(impl|trait).*Layout.* \{/,/^}$/ { P; D; }
# Delete helpers traits.
/^(pub )?trait ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? \{$/,/^\}$/D
# Patch private helpers.
/^impl.*Private.*Helpers/,/^\}$/ {
s/^impl<'a> Private([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for &'a ([^ ]+) \{$/impl \3 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
# Patch public helpers.
/^impl.*Helpers/,/^\}$/ {
s/^impl(<'a>)? ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for (&'a )?([^ ]+) \{$/impl \5 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn .*\(&?self[,)]/s/(unsafe )?fn/pub &/
/^ *pub (unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
The few error cases were then fixed by hand.
82 lines
3.3 KiB
Rust
82 lines
3.3 KiB
Rust
/* 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/. */
|
|
|
|
use document_loader::DocumentLoader;
|
|
use dom::bindings::codegen::Bindings::DOMParserBinding;
|
|
use dom::bindings::codegen::Bindings::DOMParserBinding::DOMParserMethods;
|
|
use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::{Text_html, Text_xml};
|
|
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState;
|
|
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::{JS, Root};
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
use dom::document::DocumentSource;
|
|
use dom::document::{Document, IsHTMLDocument};
|
|
use dom::window::Window;
|
|
use parse::html::{ParseContext, parse_html};
|
|
use util::str::DOMString;
|
|
|
|
use std::borrow::ToOwned;
|
|
|
|
#[dom_struct]
|
|
pub struct DOMParser {
|
|
reflector_: Reflector,
|
|
window: JS<Window>, //XXXjdm Document instead?
|
|
}
|
|
|
|
impl DOMParser {
|
|
fn new_inherited(window: &Window) -> DOMParser {
|
|
DOMParser {
|
|
reflector_: Reflector::new(),
|
|
window: JS::from_ref(window),
|
|
}
|
|
}
|
|
|
|
pub fn new(window: &Window) -> Root<DOMParser> {
|
|
reflect_dom_object(box DOMParser::new_inherited(window), GlobalRef::Window(window),
|
|
DOMParserBinding::Wrap)
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef) -> Fallible<Root<DOMParser>> {
|
|
Ok(DOMParser::new(global.as_window()))
|
|
}
|
|
}
|
|
|
|
impl<'a> DOMParserMethods for &'a DOMParser {
|
|
// https://domparsing.spec.whatwg.org/#the-domparser-interface
|
|
fn ParseFromString(self,
|
|
s: DOMString,
|
|
ty: DOMParserBinding::SupportedType)
|
|
-> Fallible<Root<Document>> {
|
|
let window = self.window.root();
|
|
let url = window.r().get_url();
|
|
let content_type = DOMParserBinding::SupportedTypeValues::strings[ty as usize].to_owned();
|
|
let doc = window.r().Document();
|
|
let doc = doc.r();
|
|
let loader = DocumentLoader::new(&*doc.loader());
|
|
match ty {
|
|
Text_html => {
|
|
let document = Document::new(window.r(), Some(url.clone()),
|
|
IsHTMLDocument::HTMLDocument,
|
|
Some(content_type),
|
|
None,
|
|
DocumentSource::FromParser,
|
|
loader);
|
|
parse_html(document.r(), s, &url, ParseContext::Owner(None));
|
|
document.r().set_ready_state(DocumentReadyState::Complete);
|
|
Ok(document)
|
|
}
|
|
Text_xml => {
|
|
//FIXME: this should probably be FromParser when we actually parse the string (#3756).
|
|
Ok(Document::new(window.r(), Some(url.clone()),
|
|
IsHTMLDocument::NonHTMLDocument,
|
|
Some(content_type),
|
|
None,
|
|
DocumentSource::NotFromParser,
|
|
loader))
|
|
}
|
|
}
|
|
}
|
|
}
|