mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
broadcasting storage changes events
This commit is contained in:
parent
225d7d2ece
commit
1cc5bd4287
13 changed files with 111 additions and 84 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue