5 files changed, 93 insertions, 21 deletions
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
new file mode 100644
index 00000000000..3f4cda9d8bf
--- /dev/null
+++ b/components/script/dom/storage.rs
@@ -0,0 +1,66 @@
+/* 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::global::GlobalRef;
+use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
+use servo_util::str::DOMString;
+
+#[dom_struct]
+pub struct Storage {
+    reflector_: Reflector,
+}
+
+impl Storage {
+    fn new_inherited() -> Storage {
+        Storage {
+            reflector_: Reflector::new(),
+        }
+    }
+
+    pub fn new(global: &GlobalRef) -> Temporary<Storage> {
+        reflect_dom_object(box Storage::new_inherited(), global, StorageBinding::Wrap)
+    }
+}
+
+impl<'a> StorageMethods for JSRef<'a, Storage> {
+    fn Length(self) -> u32 {
+        0
+    }
+
+    fn Key(self, index: u32) -> Option<DOMString> {
+
+        //Return null for out of range index
+        if index >= self.Length() {
+            return None;
+        }
+
+        return None;
+    }
+
+    fn GetItem(self, key: DOMString) -> Option<DOMString> {
+        if key.is_empty() {
+            return None;
+        }
+
+        return None;
+    }
+
+    fn NamedGetter(self, key: DOMString, found: &mut bool) -> Option<DOMString> {
+        let item = self.GetItem(key);
+        *found = item.is_some();
+        item
+    }
+
+    fn Clear(self) {
+    }
+}
+
+impl Reflectable for Storage {
+    fn reflector<'a>(&'a self) -> &'a Reflector {
+        &self.reflector_
+    }
+}
diff --git a/components/script/dom/webidls/Storage.webidl b/components/script/dom/webidls/Storage.webidl
new file mode 100644
index 00000000000..c4d59c3bc4e
--- /dev/null
+++ b/components/script/dom/webidls/Storage.webidl
@@ -0,0 +1,25 @@
+/* -*- 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/.
+ *
+ * The origin of this IDL file is
+ * https://html.spec.whatwg.org/multipage/webstorage.html#webstorage
+ *
+ */
+
+interface Storage {
+
+  readonly attribute unsigned long length;
+
+  DOMString? key(unsigned long index);
+
+  getter DOMString? getItem(DOMString name);
+
+  //setter creator void setItem(DOMString name, DOMString value);
+
+  //deleter not supported yet
+  //deleter void removeItem(DOMString name);
+
+  void clear();
+};
diff --git a/components/script/lib.rs b/components/script/lib.rs
index cbacf516a3f..e93ddd9dc29 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -193,6 +193,7 @@ pub mod dom {
     pub mod range;
     pub mod screen;
     pub mod servohtmlparser;
+    pub mod storage;
     pub mod text;
     pub mod treewalker;
     pub mod uievent;
diff --git a/tests/content/test_interfaces.html b/tests/content/test_interfaces.html
index 8f257704d38..825356e7d39 100644
--- a/tests/content/test_interfaces.html
+++ b/tests/content/test_interfaces.html
@@ -155,6 +155,7 @@ var interfaceNamesInGlobalScope = [
   "ProgressEvent",
   "Range",
   "Screen",
+  "Storage",
   "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 f5b0c7769a0..a2367497351 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -9567,36 +9567,15 @@
   [WorkerLocation interface object length]
     expected: FAIL
 
-  [Storage interface: existence and properties of interface object]
-    expected: FAIL
-
   [Storage interface object length]
     expected: FAIL
 
-  [Storage interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [Storage interface: existence and properties of interface prototype object\'s "constructor" property]
-    expected: FAIL
-
-  [Storage interface: attribute length]
-    expected: FAIL
-
-  [Storage interface: operation key(unsigned long)]
-    expected: FAIL
-
-  [Storage interface: operation getItem(DOMString)]
-    expected: FAIL
-
   [Storage interface: operation setItem(DOMString,DOMString)]
     expected: FAIL
 
   [Storage interface: operation removeItem(DOMString)]
     expected: FAIL
 
-  [Storage interface: operation clear()]
-    expected: FAIL
-
   [StorageEvent interface: existence and properties of interface object]
     expected: FAIL