aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/storage.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-05-13 14:20:00 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-11 19:44:32 +0200
commit0b3ab875f4c99f63d6caa9be528890ad98b1b2b7 (patch)
tree4139e748dd73a729f5a84c277e90f3f15e0df85a /components/script/dom/storage.rs
parent51bcf516c831f60a6fc05d970df5fad99730558e (diff)
downloadservo-0b3ab875f4c99f63d6caa9be528890ad98b1b2b7.tar.gz
servo-0b3ab875f4c99f63d6caa9be528890ad98b1b2b7.zip
Remove intrinsic Root::r()
Diffstat (limited to 'components/script/dom/storage.rs')
-rw-r--r--components/script/dom/storage.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
index b8a3865cadd..3441f57a7e7 100644
--- a/components/script/dom/storage.rs
+++ b/components/script/dom/storage.rs
@@ -180,8 +180,7 @@ impl Runnable for StorageEventRunnable {
fn main_thread_handler(self: Box<StorageEventRunnable>, script_thread: &ScriptThread) {
let this = *self;
- let storage_root = this.element.root();
- let storage = storage_root.r();
+ let storage = this.element.root();
let global = storage.global();
let ev_url = storage.get_url();
@@ -191,13 +190,12 @@ impl Runnable for StorageEventRunnable {
EventBubbles::DoesNotBubble, EventCancelable::NotCancelable,
this.key.map(DOMString::from), this.old_value.map(DOMString::from), this.new_value.map(DOMString::from),
DOMString::from(ev_url.to_string()),
- Some(storage)
+ Some(&storage)
);
let root_context = script_thread.root_browsing_context();
for it_context in root_context.iter() {
- let it_window_root = it_context.active_window();
- let it_window = it_window_root.r();
+ let it_window = it_context.active_window();
assert!(UrlHelper::SameOrigin(&ev_url, &it_window.get_url()));
// TODO: Such a Document object is not necessarily fully active, but events fired on such
// objects are ignored by the event loop until the Document becomes fully active again.