aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
authorAndrew Guertin <andrew.guertin@uvm.edu>2014-10-03 19:17:43 -0400
committerAndrew Guertin <andrew.guertin@uvm.edu>2014-10-03 20:08:05 -0400
commit815a701455284a923f2d4ee80a3e36c2ff119b67 (patch)
tree0b32ac01b2f09ee8bab9d2128c4b1f2e6c736fec /components/script/dom/window.rs
parenta6cd13c89054b605e1000bc3475153fbd2fde7bf (diff)
downloadservo-815a701455284a923f2d4ee80a3e36c2ff119b67.tar.gz
servo-815a701455284a923f2d4ee80a3e36c2ff119b67.zip
Replace Cell<Option<JS<T>>> with MutNullableJS<T>
https://github.com/servo/servo/issues/3564
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index f48fb5a2e43..dd01611bab7 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::codegen::InheritTypes::EventTargetCast;
use dom::bindings::error::{Fallible, InvalidCharacter};
use dom::bindings::global;
-use dom::bindings::js::{MutNullableJS, JS, JSRef, Temporary, OptionalSettable};
+use dom::bindings::js::{MutNullableJS, JSRef, Temporary, OptionalSettable};
use dom::bindings::trace::{Traceable, Untraceable};
use dom::bindings::utils::{Reflectable, Reflector};
use dom::browsercontext::BrowserContext;
@@ -94,7 +94,7 @@ pub struct Window {
performance: MutNullableJS<Performance>,
pub navigationStart: u64,
pub navigationStartPrecise: f64,
- screen: Cell<Option<JS<Screen>>>,
+ screen: MutNullableJS<Screen>,
}
impl Window {
@@ -338,7 +338,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let screen = Screen::new(self);
self.screen.assign(Some(screen));
}
- Temporary::new(self.screen.get().as_ref().unwrap().clone())
+ self.screen.get().unwrap()
}
fn Debug(self, message: DOMString) {
@@ -542,7 +542,7 @@ impl Window {
performance: Default::default(),
navigationStart: time::get_time().sec as u64,
navigationStartPrecise: time::precise_time_s(),
- screen: Cell::new(None),
+ screen: Default::default(),
};
WindowBinding::Wrap(cx, win)