Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
  * Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 419 matching lines @@
       if (!settings().getForceMainWorldInitialization())
         break;
       for (Frame* frame = mainFrame(); frame;
            frame = frame->tree().traverseNext()) {
         if (!frame->isLocalFrame())
           continue;
         LocalFrame* localFrame = toLocalFrame(frame);
         if (localFrame->loader()
                 .stateMachine()
                 ->committedFirstRealDocumentLoad()) {
-          // Forcibly instantiate WindowProxy.
-          localFrame->script().windowProxy(DOMWrapperWorld::mainWorld());
+          localFrame->script().initializeMainWorld();
         }
       }
     } break;
   }
 }
 
 void Page::updateAcceleratedCompositingSettings() {
   for (Frame* frame = mainFrame(); frame;
        frame = frame->tree().traverseNext()) {
     if (!frame->isLocalFrame())
@@ skipping 92 matching lines @@
     : chromeClient(nullptr),
       contextMenuClient(nullptr),
       editorClient(nullptr),
       spellCheckerClient(nullptr) {}
 
 Page::PageClients::~PageClients() {}
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink