Merge pull request #3186 from wenderen/Window.frames

implement window.frames; r=Manishearth

3 files changed, 6 insertions, 5 deletions

diff --git a/src/components/script/dom/webidls/Window.webidl b/src/components/script/dom/webidls/Window.webidl
index 8571f9c9b64..9cd6ed1c045 100644
--- a/src/components/script/dom/webidls/Window.webidl
+++ b/src/components/script/dom/webidls/Window.webidl
@@ -30,6 +30,7 @@
 
   // other browsing contexts
   //[Replaceable] readonly attribute WindowProxy frames;
+  readonly attribute Window frames;
   //[Replaceable] readonly attribute unsigned long length;
   //[Unforgeable] readonly attribute WindowProxy top;
   //         attribute any opener;
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 7d60c09a5fc..23b6c71e029 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -195,6 +195,11 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
         self.Window()
     }
 
+    // http://www.whatwg.org/html/#dom-frames
+    fn Frames(&self) -> Temporary<Window> {
+        self.Window()
+    }
+
     fn Parent(&self) -> Temporary<Window> {
         //TODO - Once we support iframes correctly this needs to return the parent frame
         self.Window()
diff --git a/src/test/wpt/metadata/html/browsers/the-window-object/window-aliases.html.ini b/src/test/wpt/metadata/html/browsers/the-window-object/window-aliases.html.ini
deleted file mode 100644
index e7df55d4411..00000000000
--- a/src/test/wpt/metadata/html/browsers/the-window-object/window-aliases.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[window-aliases.html]
-  type: testharness
-  [frames should be the global object]
-    expected: FAIL
-