Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/core/frame/Window.idl

Index: third_party/WebKit/Source/core/frame/Window.idl
diff --git a/third_party/WebKit/Source/core/frame/Window.idl b/third_party/WebKit/Source/core/frame/Window.idl
index 265cc88a4da44333415a9417802ec6cc61b6fe94..0c67561b07457f6d3a2bd7daa6e9e77529fad764 100644
--- a/third_party/WebKit/Source/core/frame/Window.idl
+++ b/third_party/WebKit/Source/core/frame/Window.idl
@@ -34,8 +34,9 @@
 ] interface Window : EventTarget {
     // the current browsing context
     // FIXME: The spec uses the WindowProxy type for this and many other attributes.
-    [Unforgeable, CallWith=ScriptState, CrossOrigin] readonly attribute Window window;
-    [Replaceable, CallWith=ScriptState, CrossOrigin] readonly attribute Window self;
+    [Unforgeable, CrossOrigin] readonly attribute Window window;
+    [Replaceable, CrossOrigin] readonly attribute Window self;
+    [Replaceable, CrossOrigin] readonly attribute Window frames;
     [Unforgeable, CachedAccessor] readonly attribute Document document;
     attribute DOMString name;
     [PutForwards=href, Unforgeable, CrossOrigin=(Getter,Setter)] readonly attribute Location location;
@@ -54,7 +55,6 @@
     [CrossOrigin] void blur();
 
     // other browsing contexts
-    [Replaceable, CallWith=ScriptState, CrossOrigin] readonly attribute Window frames;
     [Replaceable, CrossOrigin] readonly attribute unsigned long length;
     [Unforgeable, CrossOrigin] readonly attribute Window? top;
     // FIXME: opener should be of type any.