Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unsound Root::deref() call in Document::get_html_element.

Browse source
This commit is contained in:
Ms2ger 2015-01-01 17:34:46 +01:00
parent ff96d8ccd4
commit e5ae267e80
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/document.rs
View file

@ -24,7 +24,7 @@ use dom::bindings::error::Error::{NotSupported, InvalidCharacter};
use dom::bindings::error::Error::{HierarchyRequest, NamespaceError}; use dom::bindings::error::Error::{HierarchyRequest, NamespaceError};
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{MutNullableJS, JS, JSRef, Temporary, OptionalSettable, TemporaryPushable}; use dom::bindings::js::{MutNullableJS, JS, JSRef, Temporary, OptionalSettable, TemporaryPushable};
use dom::bindings::js::OptionalRootable; use dom::bindings::js::{OptionalRootable, RootedReference};
use dom::bindings::utils::reflect_dom_object; use dom::bindings::utils::reflect_dom_object;
use dom::bindings::utils::xml_name_type; use dom::bindings::utils::xml_name_type;
use dom::bindings::utils::XMLName::{QName, Name, InvalidXMLName}; use dom::bindings::utils::XMLName::{QName, Name, InvalidXMLName};
@ -491,9 +491,11 @@ impl<'a> PrivateDocumentHelpers for JSRef<'a, Document> {
} }
fn get_html_element(self) -> Option<Temporary<HTMLHtmlElement>> { fn get_html_element(self) -> Option<Temporary<HTMLHtmlElement>> {
self.GetDocumentElement().root().and_then(|element| { self.GetDocumentElement()
HTMLHtmlElementCast::to_ref(*element) .root()
}).map(Temporary::from_rooted) .r()
.and_then(HTMLHtmlElementCast::to_ref)
.map(Temporary::from_rooted)
} }
} }