diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-10-22 13:36:38 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-10-22 13:36:38 -0600 |
| commit | 1bc9c049c6536bc102939fd97f4390eed3dcc2bf (patch) | |
| tree | 35bdd1b121f9e900590fefbda0f69f120598898f /components/script/dom | |
| parent | bc1f610d973ca4e52e75aaeb84a1156bcd1d59cc (diff) | |
| parent | daf9e59869b037279a84ae625889459afe459096 (diff) | |
| download | servo-1bc9c049c6536bc102939fd97f4390eed3dcc2bf.tar.gz servo-1bc9c049c6536bc102939fd97f4390eed3dcc2bf.zip | |
auto merge of #3774 : ebalint/servo/3707_DOM_getters, r=jdm
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/browsercontext.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/document.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/node.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index 1a64068bd9d..5984ec3b70e 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -39,7 +39,7 @@ impl BrowserContext { pub fn active_window(&self) -> Temporary<Window> { let doc = self.active_document().root(); - Temporary::new(doc.window().clone()) + doc.window() } pub fn window_proxy(&self) -> *mut JSObject { diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 340e46db95e..cc2fed3682e 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -344,8 +344,8 @@ impl Document { } #[inline] - pub fn window<'a>(&'a self) -> &'a JS<Window> { - &self.window + pub fn window(&self) -> Temporary<Window> { + Temporary::new(self.window) } #[inline] diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index e1ff126f431..e47e67419ba 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2163,7 +2163,7 @@ pub fn document_from_node<T: NodeBase+Reflectable>(derived: JSRef<T>) -> Tempora pub fn window_from_node<T: NodeBase+Reflectable>(derived: JSRef<T>) -> Temporary<Window> { let document = document_from_node(derived).root(); - Temporary::new(document.window().clone()) + document.window() } impl<'a> VirtualMethods for JSRef<'a, Node> { |