diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-01-01 17:59:49 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-01-01 20:36:45 +0100 |
commit | 6032a2f8afeaf8978d30c4b4fcc5fe95e832cc16 (patch) | |
tree | 62bebb9b0cacb4fee81cf78058d74f2241582c8e /components/script/dom | |
parent | ca9b5353d8b270a7d98f24b800d7837cb2e62038 (diff) | |
download | servo-6032a2f8afeaf8978d30c4b4fcc5fe95e832cc16.tar.gz servo-6032a2f8afeaf8978d30c4b4fcc5fe95e832cc16.zip |
Remove unsound Root::deref() calls in DOMParser::ParseFromString.
Note that Root::clone() calls through to JSRef::clone() due to autoderef.
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/domparser.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 09cabce1700..2b8487a35ab 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -47,22 +47,22 @@ impl<'a> DOMParserMethods for JSRef<'a, DOMParser> { s: DOMString, ty: DOMParserBinding::SupportedType) -> Fallible<Temporary<Document>> { - let window = self.window.root().clone(); - let url = window.get_url(); + let window = self.window.root(); + let url = window.r().get_url(); let content_type = DOMParserBinding::SupportedTypeValues::strings[ty as uint].into_string(); match ty { Text_html => { - let document = Document::new(window, Some(url.clone()), + let document = Document::new(window.r(), Some(url.clone()), IsHTMLDocument::HTMLDocument, Some(content_type), - DocumentSource::FromParser).root().clone(); - parse_html(document, HTMLInput::InputString(s), &url); - document.set_ready_state(DocumentReadyState::Complete); - Ok(Temporary::from_rooted(document)) + DocumentSource::FromParser).root(); + parse_html(document.r(), HTMLInput::InputString(s), &url); + document.r().set_ready_state(DocumentReadyState::Complete); + Ok(Temporary::from_rooted(document.r())) } Text_xml => { //FIXME: this should probably be FromParser when we actually parse the string (#3756). - Ok(Document::new(window, Some(url.clone()), + Ok(Document::new(window.r(), Some(url.clone()), IsHTMLDocument::NonHTMLDocument, Some(content_type), DocumentSource::NotFromParser)) |