diff options
Diffstat (limited to 'components/script/dom/storage.rs')
| -rw-r--r-- | components/script/dom/storage.rs | 214 |
1 files changed, 117 insertions, 97 deletions
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index ea4662dda20..8d8ad0dc7ba 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -1,43 +1,42 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -use dom::bindings::codegen::Bindings::StorageBinding; -use dom::bindings::codegen::Bindings::StorageBinding::StorageMethods; -use dom::bindings::error::{Error, ErrorResult}; -use dom::bindings::inheritance::Castable; -use dom::bindings::js::Root; -use dom::bindings::refcounted::Trusted; -use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; -use dom::bindings::str::DOMString; -use dom::event::{Event, EventBubbles, EventCancelable}; -use dom::storageevent::StorageEvent; -use dom::window::Window; + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +use crate::dom::bindings::codegen::Bindings::StorageBinding::StorageMethods; +use crate::dom::bindings::error::{Error, ErrorResult}; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::refcounted::Trusted; +use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector}; +use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::str::DOMString; +use crate::dom::event::{Event, EventBubbles, EventCancelable}; +use crate::dom::storageevent::StorageEvent; +use crate::dom::window::Window; +use crate::task_source::TaskSource; use dom_struct::dom_struct; -use ipc_channel::ipc::{self, IpcSender}; -use net_traits::IpcSend; +use ipc_channel::ipc::IpcSender; use net_traits::storage_thread::{StorageThreadMsg, StorageType}; -use script_thread::{Runnable, ScriptThread}; +use net_traits::IpcSend; +use profile_traits::ipc; use script_traits::ScriptMsg; use servo_url::ServoUrl; -use task_source::TaskSource; #[dom_struct] pub struct Storage { reflector_: Reflector, - storage_type: StorageType + storage_type: StorageType, } impl Storage { fn new_inherited(storage_type: StorageType) -> Storage { Storage { reflector_: Reflector::new(), - storage_type: storage_type + storage_type: storage_type, } } - pub fn new(global: &Window, storage_type: StorageType) -> Root<Storage> { - reflect_dom_object(box Storage::new_inherited(storage_type), global, StorageBinding::Wrap) + pub fn new(global: &Window, storage_type: StorageType) -> DomRoot<Storage> { + reflect_dom_object(Box::new(Storage::new_inherited(storage_type)), global) } fn get_url(&self) -> ServoUrl { @@ -47,31 +46,41 @@ impl Storage { fn get_storage_thread(&self) -> IpcSender<StorageThreadMsg> { self.global().resource_threads().sender() } - } impl StorageMethods for Storage { // https://html.spec.whatwg.org/multipage/#dom-storage-length fn Length(&self) -> u32 { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); - self.get_storage_thread().send(StorageThreadMsg::Length(sender, self.get_url(), self.storage_type)).unwrap(); + self.get_storage_thread() + .send(StorageThreadMsg::Length( + sender, + self.get_url(), + self.storage_type, + )) + .unwrap(); receiver.recv().unwrap() as u32 } // https://html.spec.whatwg.org/multipage/#dom-storage-key fn Key(&self, index: u32) -> Option<DOMString> { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); self.get_storage_thread() - .send(StorageThreadMsg::Key(sender, self.get_url(), self.storage_type, index)) + .send(StorageThreadMsg::Key( + sender, + self.get_url(), + self.storage_type, + index, + )) .unwrap(); receiver.recv().unwrap().map(DOMString::from) } // https://html.spec.whatwg.org/multipage/#dom-storage-getitem fn GetItem(&self, name: DOMString) -> Option<DOMString> { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); let name = String::from(name); let msg = StorageThreadMsg::GetItem(sender, self.get_url(), self.storage_type, name); @@ -81,29 +90,36 @@ impl StorageMethods for Storage { // https://html.spec.whatwg.org/multipage/#dom-storage-setitem fn SetItem(&self, name: DOMString, value: DOMString) -> ErrorResult { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); let name = String::from(name); let value = String::from(value); - let msg = StorageThreadMsg::SetItem(sender, self.get_url(), self.storage_type, name.clone(), value.clone()); + let msg = StorageThreadMsg::SetItem( + sender, + self.get_url(), + self.storage_type, + name.clone(), + value.clone(), + ); self.get_storage_thread().send(msg).unwrap(); match receiver.recv().unwrap() { Err(_) => Err(Error::QuotaExceeded), Ok((changed, old_value)) => { - if changed { - self.broadcast_change_notification(Some(name), old_value, Some(value)); - } - Ok(()) - } + if changed { + self.broadcast_change_notification(Some(name), old_value, Some(value)); + } + Ok(()) + }, } } // https://html.spec.whatwg.org/multipage/#dom-storage-removeitem fn RemoveItem(&self, name: DOMString) { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); let name = String::from(name); - let msg = StorageThreadMsg::RemoveItem(sender, self.get_url(), self.storage_type, name.clone()); + let msg = + StorageThreadMsg::RemoveItem(sender, self.get_url(), self.storage_type, name.clone()); self.get_storage_thread().send(msg).unwrap(); if let Some(old_value) = receiver.recv().unwrap() { self.broadcast_change_notification(Some(name), Some(old_value), None); @@ -112,9 +128,15 @@ impl StorageMethods for Storage { // https://html.spec.whatwg.org/multipage/#dom-storage-clear fn Clear(&self) { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); - self.get_storage_thread().send(StorageThreadMsg::Clear(sender, self.get_url(), self.storage_type)).unwrap(); + self.get_storage_thread() + .send(StorageThreadMsg::Clear( + sender, + self.get_url(), + self.storage_type, + )) + .unwrap(); if receiver.recv().unwrap() { self.broadcast_change_notification(None, None, None); } @@ -122,14 +144,21 @@ impl StorageMethods for Storage { // https://html.spec.whatwg.org/multipage/#the-storage-interface:supported-property-names fn SupportedPropertyNames(&self) -> Vec<DOMString> { - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); - self.get_storage_thread().send(StorageThreadMsg::Keys(sender, self.get_url(), self.storage_type)).unwrap(); - receiver.recv() - .unwrap() - .into_iter() - .map(DOMString::from) - .collect() + self.get_storage_thread() + .send(StorageThreadMsg::Keys( + sender, + self.get_url(), + self.storage_type, + )) + .unwrap(); + receiver + .recv() + .unwrap() + .into_iter() + .map(DOMString::from) + .collect() } // check-tidy: no specs after this line @@ -146,65 +175,56 @@ impl StorageMethods for Storage { } } - impl Storage { - /// https://html.spec.whatwg.org/multipage/#send-a-storage-notification - fn broadcast_change_notification(&self, key: Option<String>, old_value: Option<String>, - new_value: Option<String>) { - let pipeline_id = self.global().pipeline_id(); + /// <https://html.spec.whatwg.org/multipage/#send-a-storage-notification> + fn broadcast_change_notification( + &self, + key: Option<String>, + old_value: Option<String>, + new_value: Option<String>, + ) { let storage = self.storage_type; let url = self.get_url(); - let msg = ScriptMsg::BroadcastStorageEvent(pipeline_id, storage, url, key, old_value, new_value); - self.global().constellation_chan().send(msg).unwrap(); + let msg = ScriptMsg::BroadcastStorageEvent(storage, url, key, old_value, new_value); + self.global() + .script_to_constellation_chan() + .send(msg) + .unwrap(); } - /// https://html.spec.whatwg.org/multipage/#send-a-storage-notification - pub fn queue_storage_event(&self, url: ServoUrl, - key: Option<String>, old_value: Option<String>, new_value: Option<String>) { + /// <https://html.spec.whatwg.org/multipage/#send-a-storage-notification> + pub fn queue_storage_event( + &self, + url: ServoUrl, + key: Option<String>, + old_value: Option<String>, + new_value: Option<String>, + ) { let global = self.global(); - let window = global.as_window(); - let task_source = window.dom_manipulation_task_source(); - let trusted_storage = Trusted::new(self); - task_source + let this = Trusted::new(self); + global + .as_window() + .task_manager() + .dom_manipulation_task_source() .queue( - box StorageEventRunnable::new(trusted_storage, url, key, old_value, new_value), &global) + task!(send_storage_notification: move || { + let this = this.root(); + let global = this.global(); + let event = StorageEvent::new( + global.as_window(), + atom!("storage"), + EventBubbles::DoesNotBubble, + EventCancelable::NotCancelable, + key.map(DOMString::from), + old_value.map(DOMString::from), + new_value.map(DOMString::from), + DOMString::from(url.into_string()), + Some(&this), + ); + event.upcast::<Event>().fire(global.upcast()); + }), + global.upcast(), + ) .unwrap(); } } - -pub struct StorageEventRunnable { - element: Trusted<Storage>, - url: ServoUrl, - key: Option<String>, - old_value: Option<String>, - new_value: Option<String> -} - -impl StorageEventRunnable { - fn new(storage: Trusted<Storage>, url: ServoUrl, - key: Option<String>, old_value: Option<String>, new_value: Option<String>) -> StorageEventRunnable { - StorageEventRunnable { element: storage, url: url, key: key, old_value: old_value, new_value: new_value } - } -} - -impl Runnable for StorageEventRunnable { - fn name(&self) -> &'static str { "StorageEventRunnable" } - - fn main_thread_handler(self: Box<StorageEventRunnable>, _: &ScriptThread) { - let this = *self; - let storage = this.element.root(); - let global = storage.global(); - let window = global.as_window(); - - let storage_event = StorageEvent::new( - &window, - atom!("storage"), - EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, - this.key.map(DOMString::from), this.old_value.map(DOMString::from), this.new_value.map(DOMString::from), - DOMString::from(this.url.into_string()), - Some(&storage) - ); - - storage_event.upcast::<Event>().fire(window.upcast()); - } -} |