Make ScriptController inherit LocalWindowProxyManager

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 344 matching lines @@
   visitor->trace(m_spellChecker);
   visitor->trace(m_selection);
   visitor->trace(m_eventHandler);
   visitor->trace(m_console);
   visitor->trace(m_inputMethodController);
   visitor->trace(m_idleSpellCheckCallback);
   Frame::trace(visitor);
   Supplementable<LocalFrame>::trace(visitor);
 }
 
-WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) {
-  return m_script->windowProxy(world);
-}
-
 void LocalFrame::navigate(Document& originDocument,
                           const KURL& url,
                           bool replaceCurrentItem,
                           UserGestureStatus userGestureStatus) {
   m_navigationScheduler->scheduleLocationChange(
       &originDocument, url.getString(), replaceCurrentItem);
 }
 
 void LocalFrame::navigate(const FrameLoadRequest& request) {
   m_loader.load(request);
@@ skipping 109 matching lines @@
 
   domWindow()->printErrorMessage(message);
 }
 
 void LocalFrame::printNavigationWarning(const String& message) {
   m_console->addMessage(
       ConsoleMessage::create(JSMessageSource, WarningMessageLevel, message));
 }
 
 WindowProxyManagerBase* LocalFrame::getWindowProxyManager() const {
-  return m_script->getWindowProxyManager();
+  return m_script;
 }
 
 bool LocalFrame::shouldClose() {
   // TODO(dcheng): This should be fixed to dispatch beforeunload events to
   // both local and remote frames.
   return m_loader.shouldClose();
 }
 
 void LocalFrame::detachChildren() {
   DCHECK(m_loader.stateMachine()->creatingInitialEmptyDocument() || document());
 
   if (Document* document = this->document())
     ChildFrameDisconnector(*document).disconnect();
 }
 
 void LocalFrame::documentAttached() {
   DCHECK(document());
   selection().documentAttached(document());
   inputMethodController().documentAttached(document());
 }
 
 LocalDOMWindow* LocalFrame::domWindow() const {
   return toLocalDOMWindow(m_domWindow);
 }
 
 void LocalFrame::setDOMWindow(LocalDOMWindow* domWindow) {
   if (domWindow)
-    script().clearWindowProxy();
+    script().clearForNavigation();
 
   if (this->domWindow())
     this->domWindow()->reset();
   m_domWindow = domWindow;
 }
 
 Document* LocalFrame::document() const {
   return m_domWindow ? m_domWindow->document() : nullptr;
 }
 
@@ skipping 340 matching lines @@
 inline LocalFrame::LocalFrame(FrameLoaderClient* client,
                               FrameHost* host,
                               FrameOwner* owner,
                               InterfaceProvider* interfaceProvider,
                               InterfaceRegistry* interfaceRegistry)
     : Frame(client, host, owner),
       m_frameScheduler(page()->chromeClient().createFrameScheduler(
           client->frameBlameContext())),
       m_loader(this),
       m_navigationScheduler(NavigationScheduler::create(this)),
-      m_script(ScriptController::create(this)),
+      m_script(ScriptController::create(*this)),
       m_editor(Editor::create(*this)),
       m_spellChecker(SpellChecker::create(*this)),
       m_selection(FrameSelection::create(*this)),
       m_eventHandler(new EventHandler(*this)),
       m_console(FrameConsole::create(*this)),
       m_inputMethodController(InputMethodController::create(*this)),
       m_idleSpellCheckCallback(IdleSpellCheckCallback::create(*this)),
       m_navigationDisableCount(0),
       m_pageZoomFactor(parentPageZoomFactor(this)),
       m_textZoomFactor(parentTextZoomFactor(this)),
@@ skipping 45 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink