bindings: Simplifies WindowProxyManager and its relation to Frame.

third_party/WebKit/Source/core/frame/Frame.h

Index: third_party/WebKit/Source/core/frame/Frame.h
diff --git a/third_party/WebKit/Source/core/frame/Frame.h b/third_party/WebKit/Source/core/frame/Frame.h
index 90f5a649d6f618c3707e88be1c58bacf71382862..c1a621d13630a137dde728603e565dffeaa093d1 100644
--- a/third_party/WebKit/Source/core/frame/Frame.h
+++ b/third_party/WebKit/Source/core/frame/Frame.h
@@ -54,7 +54,7 @@ class Page;
 class SecurityContext;
 class Settings;
 class WindowProxy;
-class WindowProxyManagerBase;
+class WindowProxyManager;
 struct FrameLoadRequest;
 
 enum class FrameDetachType { Remove, Swap };
@@ -74,8 +74,6 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   virtual bool isLocalFrame() const = 0;
   virtual bool isRemoteFrame() const = 0;
 
-  virtual WindowProxy* windowProxy(DOMWrapperWorld&) = 0;
-
   virtual void navigate(Document& originDocument,
                         const KURL&,
                         bool replaceCurrentItem,
@@ -104,6 +102,8 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   void setOwner(FrameOwner* owner) { m_owner = owner; }
   HTMLFrameOwnerElement* deprecatedLocalOwner() const;
 
+  WindowProxy* windowProxy(DOMWrapperWorld&);

[dcheng, 2017/02/23 19:02:36]

For grouping, maybe this should be placed with getWindowProxyManager()?

[Yuki, 2017/03/09 14:58:53]

Done.

+
   DOMWindow* domWindow() const { return m_domWindow; }
 
   FrameTree& tree() const;
@@ -141,7 +141,9 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   void setIsLoading(bool isLoading) { m_isLoading = isLoading; }
   bool isLoading() const { return m_isLoading; }
 
-  virtual WindowProxyManagerBase* getWindowProxyManager() const = 0;
+  WindowProxyManager* getWindowProxyManager() const {
+    return m_windowProxyManager;
+  }
 
   virtual void didChangeVisibilityState();
 
@@ -151,7 +153,7 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   bool isDetaching() const { return m_isDetaching; }
 
  protected:
-  Frame(FrameClient*, FrameHost*, FrameOwner*);
+  Frame(FrameClient*, FrameHost*, FrameOwner*, WindowProxyManager*);
 
   mutable FrameTree m_treeNode;
 
@@ -166,6 +168,7 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   bool canNavigateWithoutFramebusting(const Frame&, String& errorReason);
 
   Member<FrameClient> m_client;
+  const Member<WindowProxyManager> m_windowProxyManager;
   bool m_isLoading;
 };