Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7521 - eefriedman:unnecessary-refcell, r=jdm

Browse source 
Remove unnecessary uses of DOMRefCell.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7521)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-02 17:28:37 -06:00
commit 0f596cdb55
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/script/dom/storageevent.rs
View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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::EventBinding::{EventMethods};
use dom::bindings::codegen::Bindings::StorageEventBinding; use dom::bindings::codegen::Bindings::StorageEventBinding;
use dom::bindings::codegen::Bindings::StorageEventBinding::{StorageEventMethods}; use dom::bindings::codegen::Bindings::StorageEventBinding::{StorageEventMethods};
@ -19,10 +18,10 @@ use util::str::DOMString;
#[dom_struct] #[dom_struct]
pub struct StorageEvent { pub struct StorageEvent {
event: Event, event: Event,
key: DOMRefCell<Option<DOMString>>, key: Option<DOMString>,
oldValue: DOMRefCell<Option<DOMString>>, oldValue: Option<DOMString>,
newValue: DOMRefCell<Option<DOMString>>, newValue: Option<DOMString>,
url: DOMRefCell<DOMString>, url: DOMString,
storageArea: MutNullableHeap<JS<Storage>> storageArea: MutNullableHeap<JS<Storage>>
} }
@ -36,10 +35,10 @@ impl StorageEvent {
storageArea: Option<&Storage>) -> StorageEvent { storageArea: Option<&Storage>) -> StorageEvent {
StorageEvent { StorageEvent {
event: Event::new_inherited(type_id), event: Event::new_inherited(type_id),
key: DOMRefCell::new(key), key: key,
oldValue: DOMRefCell::new(oldValue), oldValue: oldValue,
newValue: DOMRefCell::new(newValue), newValue: newValue,
url: DOMRefCell::new(url), url: url,
storageArea: MutNullableHeap::new(storageArea.map(JS::from_ref)) storageArea: MutNullableHeap::new(storageArea.map(JS::from_ref))
} }
} }
@ -90,22 +89,22 @@ impl StorageEvent {
impl StorageEventMethods for StorageEvent { impl StorageEventMethods for StorageEvent {
// https://html.spec.whatwg.org/multipage/#dom-storageevent-key // https://html.spec.whatwg.org/multipage/#dom-storageevent-key
fn GetKey(&self) -> Option<DOMString> { fn GetKey(&self) -> Option<DOMString> {
self.key.borrow().clone() self.key.clone()
} }
// https://html.spec.whatwg.org/multipage/#dom-storageevent-oldvalue // https://html.spec.whatwg.org/multipage/#dom-storageevent-oldvalue
fn GetOldValue(&self) -> Option<DOMString> { fn GetOldValue(&self) -> Option<DOMString> {
self.oldValue.borrow().clone() self.oldValue.clone()
} }
// https://html.spec.whatwg.org/multipage/#dom-storageevent-newvalue // https://html.spec.whatwg.org/multipage/#dom-storageevent-newvalue
fn GetNewValue(&self) -> Option<DOMString> { fn GetNewValue(&self) -> Option<DOMString> {
self.newValue.borrow().clone() self.newValue.clone()
} }
// https://html.spec.whatwg.org/multipage/#dom-storageevent-url // https://html.spec.whatwg.org/multipage/#dom-storageevent-url
fn Url(&self) -> DOMString { fn Url(&self) -> DOMString {
self.url.borrow().clone() self.url.clone()
} }
// https://html.spec.whatwg.org/multipage/#dom-storageevent-storagearea // https://html.spec.whatwg.org/multipage/#dom-storageevent-storagearea