Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Document.implementation be in a Cell.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-06-01 17:29:58 +09:00
parent 93f8ae4cf0
commit a0a0e07f71
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/script/dom/document.rs
View file

@ -48,6 +48,7 @@ use servo_util::str::{DOMString, null_str_as_empty_ref};
use collections::hashmap::HashMap; use collections::hashmap::HashMap;
use js::jsapi::JSContext; use js::jsapi::JSContext;
use std::ascii::StrAsciiExt; use std::ascii::StrAsciiExt;
use std::cell::Cell;
use url::{Url, from_str}; use url::{Url, from_str};
#[deriving(Eq,Encodable)] #[deriving(Eq,Encodable)]
@ -62,7 +63,7 @@ pub struct Document {
pub reflector_: Reflector, pub reflector_: Reflector,
pub window: JS<Window>, pub window: JS<Window>,
pub idmap: HashMap<DOMString, Vec<JS<Element>>>, pub idmap: HashMap<DOMString, Vec<JS<Element>>>,
pub implementation: Option<JS<DOMImplementation>>, pub implementation: Cell<Option<JS<DOMImplementation>>>,
pub content_type: DOMString, pub content_type: DOMString,
pub encoding_name: DOMString, pub encoding_name: DOMString,
pub is_html_document: bool, pub is_html_document: bool,
@ -213,7 +214,7 @@ impl Document {
reflector_: Reflector::new(), reflector_: Reflector::new(),
window: window.unrooted(), window: window.unrooted(),
idmap: HashMap::new(), idmap: HashMap::new(),
implementation: None, implementation: Cell::new(None),
content_type: match content_type { content_type: match content_type {
Some(string) => string.clone(), Some(string) => string.clone(),
None => match is_html_document { None => match is_html_document {
@ -334,11 +335,11 @@ pub trait DocumentMethods {
impl<'a> DocumentMethods for JSRef<'a, Document> { impl<'a> DocumentMethods for JSRef<'a, Document> {
// http://dom.spec.whatwg.org/#dom-document-implementation // http://dom.spec.whatwg.org/#dom-document-implementation
fn Implementation(&mut self) -> Temporary<DOMImplementation> { fn Implementation(&mut self) -> Temporary<DOMImplementation> {
if self.implementation.is_none() { if self.implementation.get().is_none() {
let window = self.window.root(); let window = self.window.root();
self.implementation.assign(Some(DOMImplementation::new(&*window))); self.implementation.assign(Some(DOMImplementation::new(&*window)));
} }
Temporary::new(self.implementation.get_ref().clone()) Temporary::new(self.implementation.get().get_ref().clone())
} }
// http://dom.spec.whatwg.org/#dom-document-url // http://dom.spec.whatwg.org/#dom-document-url