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

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 -->

1 files changed, 12 insertions, 13 deletions

diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs
index c83fb4807b6..3b623390e46 100644
--- a/components/script/dom/storageevent.rs
+++ b/components/script/dom/storageevent.rs
@@ -2,7 +2,6 @@
  * 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};
@@ -19,10 +18,10 @@ use util::str::DOMString;
 #[dom_struct]
 pub struct StorageEvent {
     event: Event,
-    key: DOMRefCell<Option<DOMString>>,
-    oldValue: DOMRefCell<Option<DOMString>>,
-    newValue: DOMRefCell<Option<DOMString>>,
-    url: DOMRefCell<DOMString>,
+    key: Option<DOMString>,
+    oldValue: Option<DOMString>,
+    newValue: Option<DOMString>,
+    url: DOMString,
     storageArea: MutNullableHeap<JS<Storage>>
 }
 
@@ -36,10 +35,10 @@ impl StorageEvent {
                          storageArea: Option<&Storage>) -> StorageEvent {
         StorageEvent {
             event: Event::new_inherited(type_id),
-            key: DOMRefCell::new(key),
-            oldValue: DOMRefCell::new(oldValue),
-            newValue: DOMRefCell::new(newValue),
-            url: DOMRefCell::new(url),
+            key: key,
+            oldValue: oldValue,
+            newValue: newValue,
+            url: url,
             storageArea: MutNullableHeap::new(storageArea.map(JS::from_ref))
         }
     }
@@ -90,22 +89,22 @@ impl StorageEvent {
 impl StorageEventMethods for StorageEvent {
     // https://html.spec.whatwg.org/multipage/#dom-storageevent-key
     fn GetKey(&self) -> Option<DOMString> {
-        self.key.borrow().clone()
+        self.key.clone()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-storageevent-oldvalue
     fn GetOldValue(&self) -> Option<DOMString> {
-        self.oldValue.borrow().clone()
+        self.oldValue.clone()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-storageevent-newvalue
     fn GetNewValue(&self) -> Option<DOMString> {
-        self.newValue.borrow().clone()
+        self.newValue.clone()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-storageevent-url
     fn Url(&self) -> DOMString {
-        self.url.borrow().clone()
+        self.url.clone()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-storageevent-storagearea