diff options
author | snf <snf@users.noreply.github.com> | 2015-03-24 10:05:36 +0000 |
---|---|---|
committer | snf <snf@users.noreply.github.com> | 2015-03-31 21:51:41 +0100 |
commit | 1cc5bd4287d34afcf65395c59343c726e9c93cd5 (patch) | |
tree | d0ff20b98d96e5ecdbce78ace0277d89d780e65d /components/script | |
parent | 225d7d2ece418d5ecefd7ce9047c4754ffb68c73 (diff) | |
download | servo-1cc5bd4287d34afcf65395c59343c726e9c93cd5.tar.gz servo-1cc5bd4287d34afcf65395c59343c726e9c93cd5.zip |
broadcasting storage changes events
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/storage.rs | 98 | ||||
-rw-r--r-- | components/script/script_task.rs | 2 |
2 files changed, 91 insertions, 9 deletions
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index d15bb12b14a..191482c39c1 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -5,15 +5,27 @@ use dom::bindings::codegen::Bindings::StorageBinding; use dom::bindings::codegen::Bindings::StorageBinding::StorageMethods; use dom::bindings::global::{GlobalRef, GlobalField}; -use dom::bindings::js::{JSRef, Temporary}; +use dom::bindings::js::{JSRef, Temporary, RootedReference}; +use dom::bindings::refcounted::Trusted; use dom::bindings::utils::{Reflector, reflect_dom_object}; +use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast}; +use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable}; +use dom::eventtarget::{EventTarget}; +use dom::storageevent::StorageEvent; +use dom::urlhelper::UrlHelper; +use dom::window::WindowHelpers; use util::str::DOMString; use net::storage_task::StorageTask; use net::storage_task::StorageType; use net::storage_task::StorageTaskMsg; +use page::IterablePage; use std::sync::mpsc::channel; use url::Url; +use script_task::{ScriptTask, ScriptMsg, MainThreadRunnable}; + +use collections::borrow::ToOwned; + #[dom_struct] pub struct Storage { reflector_: Reflector, @@ -79,9 +91,10 @@ impl<'a> StorageMethods for JSRef<'a, Storage> { fn SetItem(self, name: DOMString, value: DOMString) { let (sender, receiver) = channel(); - self.get_storage_task().send(StorageTaskMsg::SetItem(sender, self.get_url(), self.storage_type, name, value)).unwrap(); - if receiver.recv().unwrap() { - //TODO send notification + self.get_storage_task().send(StorageTaskMsg::SetItem(sender, self.get_url(), self.storage_type, name.clone(), value.clone())).unwrap(); + let (changed, old_value) = receiver.recv().unwrap(); + if changed { + self.broadcast_change_notification(Some(name), old_value, Some(value)); } } @@ -96,9 +109,9 @@ impl<'a> StorageMethods for JSRef<'a, Storage> { fn RemoveItem(self, name: DOMString) { let (sender, receiver) = channel(); - self.get_storage_task().send(StorageTaskMsg::RemoveItem(sender, self.get_url(), self.storage_type, name)).unwrap(); - if receiver.recv().unwrap() { - //TODO send notification + self.get_storage_task().send(StorageTaskMsg::RemoveItem(sender, self.get_url(), self.storage_type, name.clone())).unwrap(); + if let Some(old_value) = receiver.recv().unwrap() { + self.broadcast_change_notification(Some(name), Some(old_value), None); } } @@ -111,7 +124,76 @@ impl<'a> StorageMethods for JSRef<'a, Storage> { self.get_storage_task().send(StorageTaskMsg::Clear(sender, self.get_url(), self.storage_type)).unwrap(); if receiver.recv().unwrap() { - //TODO send notification + self.broadcast_change_notification(None, None, None); + } + } +} + +trait PrivateStorageHelpers { + fn broadcast_change_notification(self, key: Option<DOMString>, old_value: Option<DOMString>, + new_value: Option<DOMString>); +} + +impl<'a> PrivateStorageHelpers for JSRef<'a, Storage> { + /// https://html.spec.whatwg.org/multipage/webstorage.html#send-a-storage-notification + fn broadcast_change_notification(self, key: Option<DOMString>, old_value: Option<DOMString>, + new_value: Option<DOMString>){ + let global_root = self.global.root(); + let global_ref = global_root.r(); + let script_chan = global_ref.script_chan(); + let trusted_storage = Trusted::new(global_ref.get_cx(), self, + script_chan.clone()); + script_chan.send(ScriptMsg::MainThreadRunnableMsg( + box StorageEventRunnable::new(trusted_storage, key, + old_value, new_value))).unwrap(); + } +} + +pub struct StorageEventRunnable { + element: Trusted<Storage>, + key: Option<DOMString>, + old_value: Option<DOMString>, + new_value: Option<DOMString> +} + +impl StorageEventRunnable { + fn new(storage: Trusted<Storage>, key: Option<DOMString>, old_value: Option<DOMString>, + new_value: Option<DOMString>) -> StorageEventRunnable { + StorageEventRunnable { element: storage, key: key, old_value: old_value, new_value: new_value } + } +} + +impl MainThreadRunnable for StorageEventRunnable { + fn handler(self: Box<StorageEventRunnable>, script_task: &ScriptTask) { + let this = *self; + let storage_root = this.element.to_temporary().root(); + let storage = storage_root.r(); + let global_root = storage.global.root(); + let global_ref = global_root.r(); + let ev_window = global_ref.as_window(); + let ev_url = storage.get_url(); + + let storage_event = StorageEvent::new( + global_ref, + "storage".to_owned(), + EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, + this.key, this.old_value, this.new_value, + ev_url.to_string(), + Some(storage) + ).root(); + let event: JSRef<Event> = EventCast::from_ref(storage_event.r()); + + let root_page = script_task.root_page(); + for it_page in root_page.iter() { + let it_window_root = it_page.window().root(); + let it_window = it_window_root.r(); + 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. + if ev_window.pipeline() != it_window.pipeline() { + let target: JSRef<EventTarget> = EventTargetCast::from_ref(it_window); + event.fire(target); + } } } } diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 2db2ef24a80..a891455c0de 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -498,7 +498,7 @@ impl ScriptTask { } // Return the root page in the frame tree. Panics if it doesn't exist. - fn root_page(&self) -> Rc<Page> { + pub fn root_page(&self) -> Rc<Page> { self.page.borrow().as_ref().unwrap().clone() } |