diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index a225c7b3439..aa588d09984 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -37,6 +37,7 @@ pub enum EventTypeId { MessageEvent, MouseEvent, ProgressEvent, + StorageEvent, UIEvent, ErrorEvent } diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 9f12913e23c..63170f8b70b 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -310,6 +310,7 @@ pub mod range; pub mod screen; pub mod servohtmlparser; pub mod storage; +pub mod storageevent; pub mod text; pub mod treewalker; pub mod uievent; diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs new file mode 100644 index 00000000000..18de6ae88f0 --- /dev/null +++ b/components/script/dom/storageevent.rs @@ -0,0 +1,113 @@ +/* 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::cell::DOMRefCell; +use dom::bindings::codegen::Bindings::EventBinding::{EventMethods}; +use dom::bindings::codegen::Bindings::StorageEventBinding; +use dom::bindings::codegen::Bindings::StorageEventBinding::{StorageEventMethods}; + +use dom::bindings::codegen::InheritTypes::{EventCast}; +use dom::bindings::error::Fallible; +use dom::bindings::global::GlobalRef; +use dom::bindings::js::{MutNullableJS, JSRef, RootedReference, Temporary}; +use dom::bindings::utils::{reflect_dom_object}; +use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable}; +use dom::storage::Storage; +use util::str::DOMString; + +#[dom_struct] +pub struct StorageEvent { + event: Event, + key: DOMRefCell>, + oldValue: DOMRefCell>, + newValue: DOMRefCell>, + url: DOMRefCell, + storageArea: MutNullableJS +} + + +impl StorageEvent { + pub fn new_inherited(type_id: EventTypeId, + key: Option, + oldValue: Option, + newValue: Option, + url: DOMString, + storageArea: Option>) -> StorageEvent { + StorageEvent { + event: Event::new_inherited(type_id), + key: DOMRefCell::new(key), + oldValue: DOMRefCell::new(oldValue), + newValue: DOMRefCell::new(newValue), + url: DOMRefCell::new(url), + storageArea: MutNullableJS::new(storageArea) + } + } + + pub fn new(global: GlobalRef, + type_: DOMString, + bubbles: EventBubbles, + cancelable: EventCancelable, + key: Option, + oldValue: Option, + newValue: Option, + url: DOMString, + storageArea: Option>) -> Temporary { + let ev = reflect_dom_object(box StorageEvent::new_inherited(EventTypeId::StorageEvent, + key, oldValue, newValue, + url, storageArea), + global, + StorageEventBinding::Wrap).root(); + let event: JSRef = EventCast::from_ref(ev.r()); + event.InitEvent(type_, bubbles == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable); + Temporary::from_rooted(ev.r()) + } + + pub fn Constructor(global: GlobalRef, + type_: DOMString, + init: &StorageEventBinding::StorageEventInit) -> Fallible> { + let key = init.key.clone(); + let oldValue = init.oldValue.clone(); + let newValue = init.newValue.clone(); + let url = init.url.clone(); + let storageArea = init.storageArea.r(); + let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble }; + let cancelable = if init.parent.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable }; + let event = StorageEvent::new(global, type_, + bubbles, cancelable, + key, oldValue, newValue, + url, storageArea); + Ok(event) + } +} + +impl<'a> StorageEventMethods for JSRef<'a, StorageEvent> { + fn GetKey(self) -> Option { + // FIXME(https://github.com/rust-lang/rust/issues/23338) + let key = self.key.borrow(); + key.clone() + } + + fn GetOldValue(self) -> Option { + // FIXME(https://github.com/rust-lang/rust/issues/23338) + let oldValue = self.oldValue.borrow(); + oldValue.clone() + } + + fn GetNewValue(self) -> Option { + // FIXME(https://github.com/rust-lang/rust/issues/23338) + let newValue = self.newValue.borrow(); + newValue.clone() + } + + fn Url(self) -> DOMString { + // FIXME(https://github.com/rust-lang/rust/issues/23338) + let url = self.url.borrow(); + url.clone() + } + + fn GetStorageArea(self) -> Option> { + self.storageArea.get() + } + +} diff --git a/components/script/dom/webidls/StorageEvent.webidl b/components/script/dom/webidls/StorageEvent.webidl new file mode 100644 index 00000000000..18386d09492 --- /dev/null +++ b/components/script/dom/webidls/StorageEvent.webidl @@ -0,0 +1,28 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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/. + * + * Interface for a client side storage. See + * https://html.spec.whatwg.org/multipage/webstorage.html#the-storageevent-interface + * for more information. + * + * Event sent to a window when a storage area changes. + */ + +[Constructor(DOMString type, optional StorageEventInit eventInitDict)] +interface StorageEvent : Event { + readonly attribute DOMString? key; + readonly attribute DOMString? oldValue; + readonly attribute DOMString? newValue; + readonly attribute DOMString url; + readonly attribute Storage? storageArea; +}; + +dictionary StorageEventInit : EventInit { + DOMString? key = null; + DOMString? oldValue = null; + DOMString? newValue = null; + DOMString url = ""; + Storage? storageArea = null; +}; diff --git a/tests/content/test_interfaces.html b/tests/content/test_interfaces.html index 09bcda3ff20..1e56c7fe262 100644 --- a/tests/content/test_interfaces.html +++ b/tests/content/test_interfaces.html @@ -163,6 +163,7 @@ var interfaceNamesInGlobalScope = [ "Range", "Screen", "Storage", + "StorageEvent", "TestBinding", // XXX "Text", "TreeWalker", diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini index a269b210e2f..cc4b443a5ae 100644 --- a/tests/wpt/metadata/html/dom/interfaces.html.ini +++ b/tests/wpt/metadata/html/dom/interfaces.html.ini @@ -9285,27 +9285,6 @@ [StorageEvent interface object length] expected: FAIL - [StorageEvent interface: existence and properties of interface prototype object] - expected: FAIL - - [StorageEvent interface: existence and properties of interface prototype object\'s "constructor" property] - expected: FAIL - - [StorageEvent interface: attribute key] - expected: FAIL - - [StorageEvent interface: attribute oldValue] - expected: FAIL - - [StorageEvent interface: attribute newValue] - expected: FAIL - - [StorageEvent interface: attribute url] - expected: FAIL - - [StorageEvent interface: attribute storageArea] - expected: FAIL - [HTMLAppletElement interface: existence and properties of interface object] expected: FAIL diff --git a/tests/wpt/metadata/webstorage/event_constructor.html.ini b/tests/wpt/metadata/webstorage/event_constructor.html.ini deleted file mode 100644 index 3ce5130acf1..00000000000 --- a/tests/wpt/metadata/webstorage/event_constructor.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[event_constructor.html] - type: testharness - expected: TIMEOUT - [Web Storage] - expected: FAIL - - [storageeventinit test] - expected: NOTRUN - diff --git a/tests/wpt/metadata/webstorage/event_constructor_js.html.ini b/tests/wpt/metadata/webstorage/event_constructor_js.html.ini deleted file mode 100644 index 447e6c26fb6..00000000000 --- a/tests/wpt/metadata/webstorage/event_constructor_js.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[event_constructor_js.html] - type: testharness - expected: TIMEOUT - [Web Storage] - expected: FAIL - - [StorageEvent constructor and nulls] - expected: NOTRUN - diff --git a/tests/wpt/metadata/webstorage/event_local_storageeventinit.html.ini b/tests/wpt/metadata/webstorage/event_local_storageeventinit.html.ini deleted file mode 100644 index 0658b8df06c..00000000000 --- a/tests/wpt/metadata/webstorage/event_local_storageeventinit.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[event_local_storageeventinit.html] - type: testharness - expected: TIMEOUT - [Web Storage] - expected: FAIL - - [storageeventinit test] - expected: NOTRUN - diff --git a/tests/wpt/metadata/webstorage/event_session_storageeventinit.html.ini b/tests/wpt/metadata/webstorage/event_session_storageeventinit.html.ini deleted file mode 100644 index e4584f0cc12..00000000000 --- a/tests/wpt/metadata/webstorage/event_session_storageeventinit.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[event_session_storageeventinit.html] - type: testharness - expected: TIMEOUT - [Web Storage] - expected: FAIL - - [storageeventinit test] - expected: NOTRUN - diff --git a/tests/wpt/metadata/webstorage/idlharness.html.ini b/tests/wpt/metadata/webstorage/idlharness.html.ini index f592faf9b40..f8e2048bd32 100644 --- a/tests/wpt/metadata/webstorage/idlharness.html.ini +++ b/tests/wpt/metadata/webstorage/idlharness.html.ini @@ -12,27 +12,6 @@ [StorageEvent interface object length] expected: FAIL - [StorageEvent interface: existence and properties of interface prototype object] - expected: FAIL - - [StorageEvent interface: existence and properties of interface prototype object\'s "constructor" property] - expected: FAIL - - [StorageEvent interface: attribute key] - expected: FAIL - - [StorageEvent interface: attribute oldValue] - expected: FAIL - - [StorageEvent interface: attribute newValue] - expected: FAIL - - [StorageEvent interface: attribute url] - expected: FAIL - - [StorageEvent interface: attribute storageArea] - expected: FAIL - [Window interface: attribute sessionStorage] expected: FAIL diff --git a/tests/wpt/metadata/webstorage/missing_arguments.html.ini b/tests/wpt/metadata/webstorage/missing_arguments.html.ini deleted file mode 100644 index 8cf2b387477..00000000000 --- a/tests/wpt/metadata/webstorage/missing_arguments.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[missing_arguments.html] - type: testharness - [Should throw TypeError for function "function () { new StorageEvent(); }".] - expected: FAIL - diff --git a/tests/wpt/metadata/webstorage/storage_local_key.html.ini b/tests/wpt/metadata/webstorage/storage_local_key.html.ini deleted file mode 100644 index 6c1b6d8aac8..00000000000 --- a/tests/wpt/metadata/webstorage/storage_local_key.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[storage_local_key.html] - type: testharness - [Web Storage 3] - expected: FAIL -