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..9831d5ecd49aac862e6c9fcdce9ac392604a3c71 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,
@@ -89,7 +87,7 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   void disconnectOwnerElement();
   virtual bool shouldClose() = 0;
 
-  FrameClient* client() const;
+  FrameClient* client() const { return m_client; }
 
   // NOTE: Page is moving out of Blink up into the browser process as
   // part of the site-isolation (out of process iframes) work.
@@ -100,13 +98,15 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
   bool isMainFrame() const;
   bool isLocalRoot() const;
 
-  FrameOwner* owner() const;
+  FrameOwner* owner() const { return m_owner; }

[dcheng, 2017/02/22 01:07:06]

Maybe split cleanup changes like this into a separate CL?

[Yuki, 2017/02/22 09:01:33]

Agreed.  Reverted these part.

   void setOwner(FrameOwner* owner) { m_owner = owner; }
   HTMLFrameOwnerElement* deprecatedLocalOwner() const;
 
+  WindowProxy* windowProxy(DOMWrapperWorld&);
+
   DOMWindow* domWindow() const { return m_domWindow; }
 
-  FrameTree& tree() const;
+  FrameTree& tree() const { return m_treeNode; }
   ChromeClient& chromeClient() const;
 
   virtual SecurityContext* securityContext() const = 0;
@@ -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,21 +168,10 @@ 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;
 };
 
-inline FrameClient* Frame::client() const {
-  return m_client;
-}
-
-inline FrameOwner* Frame::owner() const {
-  return m_owner;
-}
-
-inline FrameTree& Frame::tree() const {
-  return m_treeNode;
-}
-
 // Allow equality comparisons of Frames by reference or pointer,
 // interchangeably.
 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(Frame)