Make ScriptController inherit LocalWindowProxyManager

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/DOMWindow.h"
 
+#include "bindings/core/v8/WindowProxyManager.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/SecurityContext.h"
 #include "core/events/MessageEvent.h"
 #include "core/frame/External.h"
 #include "core/frame/Frame.h"
 #include "core/frame/FrameClient.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/LocalDOMWindow.h"
@@ skipping 10 matching lines @@
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/Suborigin.h"
 #include <memory>
 
 namespace blink {
 
-DOMWindow::DOMWindow(Frame& frame) : m_frame(frame), m_windowIsClosing(false) {}
+DOMWindow::DOMWindow(Frame& frame)
+    : m_frame(frame),
+      m_windowProxyManager(frame.getWindowProxyManager()),
+      m_windowIsClosing(false) {}
 
 DOMWindow::~DOMWindow() {
   // The frame must be disconnected before finalization.
   DCHECK(!m_frame);
 }
 
+v8::Local<v8::Object> DOMWindow::globalProxy(DOMWrapperWorld& world) {
+  return m_windowProxyManager->globalProxy(world);
+}
+
 v8::Local<v8::Object> DOMWindow::wrap(v8::Isolate*,
                                       v8::Local<v8::Object> creationContext) {
   LOG(FATAL) << "DOMWindow must never be wrapped with wrap method.  The "
                 "wrappers must be created at WindowProxy::createContext() and "
                 "setupWindowPrototypeChain().";
   return v8::Local<v8::Object>();
 }
 
 v8::Local<v8::Object> DOMWindow::associateWithWrapper(
     v8::Isolate*,
@@ skipping 20 matching lines @@
 }
 
 bool DOMWindow::closed() const {
   return m_windowIsClosing || !frame() || !frame()->host();
 }
 
 unsigned DOMWindow::length() const {
   return frame() ? frame()->tree().scopedChildCount() : 0;
 }
 
-v8::Local<v8::Object> DOMWindow::self(ScriptState* scriptState) const {
-  return scriptState->context()->Global();
-}
-
 DOMWindow* DOMWindow::opener() const {
   // FIXME: Use FrameTree to get opener as well, to simplify logic here.
   if (!frame() || !frame()->client())
     return nullptr;
 
   Frame* opener = frame()->client()->opener();
   return opener ? opener->domWindow() : nullptr;
 }
 
-DOMWindow* DOMWindow::parent() const {
+DOMWindow* DOMWindow::parent() {
+  // TODO(dcheng): Per the spec, this should only return null if there is no
+  // browsing context with the window proxy as its WindowProxy object.
   if (!frame())
     return nullptr;
 
   Frame* parent = frame()->tree().parent();
-  return parent ? parent->domWindow() : frame()->domWindow();
+  return parent ? parent->domWindow() : this;
 }
 
 DOMWindow* DOMWindow::top() const {
   if (!frame())
     return nullptr;
 
   return frame()->tree().top()->domWindow();
 }
 
 External* DOMWindow::external() const {
@@ skipping 315 matching lines @@
 
   // If we're a top level window, bring the window to the front.
   if (frame()->isMainFrame() && allowFocus)
     page->chromeClient().focus();
 
   page->focusController().focusDocumentView(frame(), true /* notifyEmbedder */);
 }
 
 DEFINE_TRACE(DOMWindow) {
   visitor->trace(m_frame);
+  visitor->trace(m_windowProxyManager);
   visitor->trace(m_location);
   EventTargetWithInlineData::trace(visitor);
 }
 
 }  // namespace blink