diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-19 17:47:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-19 17:47:27 -0400 |
commit | df2adebefdfa3da49f173e480fa1e56450f9bda2 (patch) | |
tree | 1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/storageevent.rs | |
parent | 2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff) | |
parent | c37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff) | |
download | servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip |
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format code only.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21737)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/storageevent.rs')
-rw-r--r-- | components/script/dom/storageevent.rs | 81 |
1 files changed, 50 insertions, 31 deletions
diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index 0070a2c1e68..aee88e95c19 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -23,46 +23,56 @@ pub struct StorageEvent { old_value: Option<DOMString>, new_value: Option<DOMString>, url: DOMString, - storage_area: MutNullableDom<Storage> + storage_area: MutNullableDom<Storage>, } - impl StorageEvent { - pub fn new_inherited(key: Option<DOMString>, - old_value: Option<DOMString>, - new_value: Option<DOMString>, - url: DOMString, - storage_area: Option<&Storage>) -> StorageEvent { + pub fn new_inherited( + key: Option<DOMString>, + old_value: Option<DOMString>, + new_value: Option<DOMString>, + url: DOMString, + storage_area: Option<&Storage>, + ) -> StorageEvent { StorageEvent { event: Event::new_inherited(), key: key, old_value: old_value, new_value: new_value, url: url, - storage_area: MutNullableDom::new(storage_area) + storage_area: MutNullableDom::new(storage_area), } } - pub fn new_uninitialized(window: &Window, - url: DOMString) -> DomRoot<StorageEvent> { - reflect_dom_object(Box::new(StorageEvent::new_inherited(None, None, None, url, None)), - window, - StorageEventBinding::Wrap) + pub fn new_uninitialized(window: &Window, url: DOMString) -> DomRoot<StorageEvent> { + reflect_dom_object( + Box::new(StorageEvent::new_inherited(None, None, None, url, None)), + window, + StorageEventBinding::Wrap, + ) } - pub fn new(global: &Window, - type_: Atom, - bubbles: EventBubbles, - cancelable: EventCancelable, - key: Option<DOMString>, - oldValue: Option<DOMString>, - newValue: Option<DOMString>, - url: DOMString, - storageArea: Option<&Storage>) -> DomRoot<StorageEvent> { + pub fn new( + global: &Window, + type_: Atom, + bubbles: EventBubbles, + cancelable: EventCancelable, + key: Option<DOMString>, + oldValue: Option<DOMString>, + newValue: Option<DOMString>, + url: DOMString, + storageArea: Option<&Storage>, + ) -> DomRoot<StorageEvent> { let ev = reflect_dom_object( - Box::new(StorageEvent::new_inherited(key, oldValue, newValue, url, storageArea)), + Box::new(StorageEvent::new_inherited( + key, + oldValue, + newValue, + url, + storageArea, + )), global, - StorageEventBinding::Wrap + StorageEventBinding::Wrap, ); { let event = ev.upcast::<Event>(); @@ -71,9 +81,11 @@ impl StorageEvent { ev } - pub fn Constructor(global: &Window, - type_: DOMString, - init: &StorageEventBinding::StorageEventInit) -> Fallible<DomRoot<StorageEvent>> { + pub fn Constructor( + global: &Window, + type_: DOMString, + init: &StorageEventBinding::StorageEventInit, + ) -> Fallible<DomRoot<StorageEvent>> { let key = init.key.clone(); let oldValue = init.oldValue.clone(); let newValue = init.newValue.clone(); @@ -81,10 +93,17 @@ impl StorageEvent { let storageArea = init.storageArea.r(); let bubbles = EventBubbles::from(init.parent.bubbles); let cancelable = EventCancelable::from(init.parent.cancelable); - let event = StorageEvent::new(global, Atom::from(type_), - bubbles, cancelable, - key, oldValue, newValue, - url, storageArea); + let event = StorageEvent::new( + global, + Atom::from(type_), + bubbles, + cancelable, + key, + oldValue, + newValue, + url, + storageArea, + ); Ok(event) } } |