Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/core/frame/DOMWindow.h

Index: third_party/WebKit/Source/core/frame/DOMWindow.h
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.h b/third_party/WebKit/Source/core/frame/DOMWindow.h
index 44f155ce7800ea51195340ffa6b8df9df8768477..226936751e77f5fa437e20ce0190acd14b193848 100644
--- a/third_party/WebKit/Source/core/frame/DOMWindow.h
+++ b/third_party/WebKit/Source/core/frame/DOMWindow.h
@@ -24,6 +24,7 @@ class CSSStyleDeclaration;
 class CustomElementRegistry;
 class DOMSelection;
 class DOMVisualViewport;
+class DOMWrapperWorld;
 class Document;
 class Element;
 class External;
@@ -41,6 +42,7 @@ class ScriptState;
 class ScrollToOptions;
 class SerializedScriptValue;
 class StyleMedia;
+class WindowProxyManagerBase;
 
 class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
                               public DOMWindowBase64 {
@@ -57,6 +59,8 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
     return m_frame;
   }
 
+  v8::Local<v8::Object> globalProxy(DOMWrapperWorld&);
+
   // GarbageCollectedFinalized overrides:
   DECLARE_VIRTUAL_TRACE();
 
@@ -118,16 +122,12 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
   virtual void setDefaultStatus(const String&) = 0;
 
   // Self-referential attributes
-  v8::Local<v8::Object> self(ScriptState*) const;
-  v8::Local<v8::Object> window(ScriptState* scriptState) const {
-    return self(scriptState);
-  }
-  v8::Local<v8::Object> frames(ScriptState* scriptState) const {
-    return self(scriptState);
-  }
+  DOMWindow* self() { return this; }
+  DOMWindow* window() { return this; }
+  DOMWindow* frames() { return this; }
 
   DOMWindow* opener() const;
-  DOMWindow* parent() const;
+  DOMWindow* parent();
   DOMWindow* top() const;
 
   // DOM Level 2 AbstractView Interface
@@ -271,6 +271,7 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
 
  private:
   Member<Frame> m_frame;
+  const Member<WindowProxyManagerBase> m_windowProxyManager;
   mutable Member<Location> m_location;
 
   // Set to true when close() has been called. Needed for
@@ -279,7 +280,6 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
   // operation has been performed, exposes (confusing)
   // implementation details to scripts.
   bool m_windowIsClosing;
-
 };
 
 }  // namespace blink