bindings: Simplifies WindowProxyManager and its relation to Frame.

third_party/WebKit/Source/core/frame/RemoteFrame.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/RemoteFrame.h"
 
 #include "bindings/core/v8/WindowProxy.h"
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/dom/RemoteSecurityContext.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 10 matching lines @@
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/WebLayer.h"
 
 namespace blink {
 
 inline RemoteFrame::RemoteFrame(RemoteFrameClient* client,
                                 FrameHost* host,
                                 FrameOwner* owner)
-    : Frame(client, host, owner),
-      m_securityContext(RemoteSecurityContext::create()),
-      m_windowProxyManager(RemoteWindowProxyManager::create(*this)) {
+    : Frame(client, host, owner, RemoteWindowProxyManager::create(*this)),
+      m_securityContext(RemoteSecurityContext::create()) {
   m_domWindow = RemoteDOMWindow::create(*this);
 }
 
 RemoteFrame* RemoteFrame::create(RemoteFrameClient* client,
                                  FrameHost* host,
                                  FrameOwner* owner) {
   return new RemoteFrame(client, host, owner);
 }
 
 RemoteFrame::~RemoteFrame() {
   ASSERT(!m_view);
 }
 
 DEFINE_TRACE(RemoteFrame) {
   visitor->trace(m_view);
   visitor->trace(m_securityContext);
-  visitor->trace(m_windowProxyManager);
   Frame::trace(visitor);
 }
 
-WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world) {
-  WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
-  ASSERT(windowProxy);
-  windowProxy->initializeIfNeeded();
-  return windowProxy;
-}
-
 void RemoteFrame::navigate(Document& originDocument,
                            const KURL& url,
                            bool replaceCurrentItem,
                            UserGestureStatus userGestureStatus) {
   FrameLoadRequest frameRequest(&originDocument, url);
   frameRequest.setReplacesCurrentItem(replaceCurrentItem);
   frameRequest.resourceRequest().setHasUserGesture(userGestureStatus ==
                                                    UserGestureStatus::Active);
   navigate(frameRequest);
 }
@@ skipping 23 matching lines @@
   PluginScriptForbiddenScope forbidPluginDestructorScripting;
   detachChildren();
   if (!client())
     return;
 
   // Clean up the frame's view if needed. A remote frame only has a view if
   // the parent is a local frame.
   if (m_view)
     m_view->dispose();
   client()->willBeDetached();
-  m_windowProxyManager->clearForClose();
+  getWindowProxyManager()->clearForClose();
   setView(nullptr);
   // ... the RemoteDOMWindow will need to be informed of detachment,
   // as otherwise it will keep a strong reference back to this RemoteFrame.
   // That combined with wrappers (owned and kept alive by RemoteFrame) keeping
   // persistent strong references to RemoteDOMWindow will prevent the GCing
   // of all these objects. Break the cycle by notifying of detachment.
   toRemoteDOMWindow(m_domWindow)->frameDetached();
   if (m_webLayer)
     setWebLayer(nullptr);
   Frame::detach(type);
@@ skipping 50 matching lines @@
     GraphicsLayer::registerContentsLayer(m_webLayer);
 
   ASSERT(owner());
   toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate();
 }
 
 void RemoteFrame::advanceFocus(WebFocusType type, LocalFrame* source) {
   client()->advanceFocus(type, source);
 }
 
-WindowProxyManagerBase* RemoteFrame::getWindowProxyManager() const {
-  return m_windowProxyManager.get();
-}
-
 void RemoteFrame::detachChildren() {
   using FrameVector = HeapVector<Member<Frame>>;
   FrameVector childrenToDetach;
   childrenToDetach.reserveCapacity(tree().childCount());
   for (Frame* child = tree().firstChild(); child;
        child = child->tree().nextSibling())
     childrenToDetach.push_back(child);
   for (const auto& child : childrenToDetach)
     child->detach(FrameDetachType::Remove);
 }
 
 }  // namespace blink