bindings: Simplifies WindowProxyManager and its relation to Frame.

third_party/WebKit/Source/core/frame/Frame.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 12 matching lines @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/frame/Frame.h"
 
+#include "bindings/core/v8/WindowProxyManager.h"
 #include "core/dom/DocumentType.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/input/EventHandler.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/LayoutPart.h"
@@ skipping 15 matching lines @@
 
 Frame::~Frame() {
   InstanceCounters::decrementCounter(InstanceCounters::FrameCounter);
   ASSERT(!m_owner);
 }
 
 DEFINE_TRACE(Frame) {
   visitor->trace(m_treeNode);
   visitor->trace(m_host);
   visitor->trace(m_owner);
+  visitor->trace(m_windowProxyManager);
   visitor->trace(m_domWindow);
   visitor->trace(m_client);
 }
 
 void Frame::detach(FrameDetachType type) {
   ASSERT(m_client);
   m_client->setOpener(0);
   disconnectOwnerElement();
   // After this, we must no longer talk to the client since this clears
   // its owning reference back to our owning LocalFrame.
@@ skipping 37 matching lines @@
     return true;
 
   return tree().parent()->isRemoteFrame();
 }
 
 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const {
   return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner)
                                        : nullptr;
 }
 
+WindowProxy* Frame::windowProxy(DOMWrapperWorld& world) {
+  return m_windowProxyManager->windowProxy(world);
+}
+
 static ChromeClient& emptyChromeClient() {
   DEFINE_STATIC_LOCAL(EmptyChromeClient, client, (EmptyChromeClient::create()));
   return client;
 }
 
 ChromeClient& Frame::chromeClient() const {
   if (Page* page = this->page())
     return page->chromeClient();
   return emptyChromeClient();
 }
@@ skipping 262 matching lines @@
   for (size_t i = 0; i < childFrames.size(); ++i)
     childFrames[i]->didChangeVisibilityState();
 }
 
 void Frame::setDocumentHasReceivedUserGesture() {
   m_hasReceivedUserGesture = true;
   if (Frame* parent = tree().parent())
     parent->setDocumentHasReceivedUserGesture();
 }
 
-Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner)
+Frame::Frame(FrameClient* client,
+             FrameHost* host,
+             FrameOwner* owner,
+             WindowProxyManager* windowProxyManager)
     : m_treeNode(this),
       m_host(host),
       m_owner(owner),
       m_client(client),
+      m_windowProxyManager(windowProxyManager),
       m_isLoading(false) {
   InstanceCounters::incrementCounter(InstanceCounters::FrameCounter);
 
   ASSERT(page());
 
   if (m_owner)
     m_owner->setContentFrame(*this);
   else
     page()->setMainFrame(this);
 }
 
 }  // namespace blink