bindings: Simplifies WindowProxyManager and its relation to Frame.

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 36 matching lines @@
 class FrameHost;
 class FrameOwner;
 class HTMLFrameOwnerElement;
 class LayoutPart;
 class LayoutPartItem;
 class KURL;
 class Page;
 class SecurityContext;
 class Settings;
 class WindowProxy;
-class WindowProxyManagerBase;
+class WindowProxyManager;
 struct FrameLoadRequest;
 
 enum class FrameDetachType { Remove, Swap };
 
 // Status of user gesture.
 enum class UserGestureStatus { Active, None };
 
 // Frame is the base class of LocalFrame and RemoteFrame and should only contain
 // functionality shared between both. In particular, any method related to
 // input, layout, or painting probably belongs on LocalFrame.
 class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
  public:
   virtual ~Frame();
 
   DECLARE_VIRTUAL_TRACE();
 
   virtual bool isLocalFrame() const = 0;
   virtual bool isRemoteFrame() const = 0;
 
-  virtual WindowProxy* windowProxy(DOMWrapperWorld&) = 0;
-
   virtual void navigate(Document& originDocument,
                         const KURL&,
                         bool replaceCurrentItem,
                         UserGestureStatus) = 0;
   // This version of Frame::navigate assumes the resulting navigation is not
   // to be started on a timer. Use the method above in such cases.
   virtual void navigate(const FrameLoadRequest&) = 0;
   virtual void reload(FrameLoadType, ClientRedirectPolicy) = 0;
 
   virtual void detach(FrameDetachType);
   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.
   // FrameHost should be used instead where possible.
   Page* page() const;
   FrameHost* host() const;  // Null when the frame is detached.
 
   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;
 
   Frame* findFrameForNavigation(const AtomicString& name, Frame& activeFrame);
   Frame* findUnsafeParentScrollPropagationBoundary();
 
   // This prepares the Frame for the next commit. It will detach children,
   // dispatch unload events, abort XHR requests and detach the document.
   // Returns true if the frame is ready to receive the next commit, or false
@@ skipping 14 matching lines @@
 
   Settings* settings() const;  // can be null
 
   // isLoading() is true when the embedder should think a load is in progress.
   // In the case of LocalFrames, it means that the frame has sent a
   // didStartLoading() callback, but not the matching didStopLoading(). Inside
   // blink, you probably want Document::loadEventFinished() instead.
   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();
 
   void setDocumentHasReceivedUserGesture();
   bool hasReceivedUserGesture() const { return m_hasReceivedUserGesture; }
 
   bool isDetaching() const { return m_isDetaching; }
 
  protected:
-  Frame(FrameClient*, FrameHost*, FrameOwner*);
+  Frame(FrameClient*, FrameHost*, FrameOwner*, WindowProxyManager*);
 
   mutable FrameTree m_treeNode;
 
   Member<FrameHost> m_host;
   Member<FrameOwner> m_owner;
   Member<DOMWindow> m_domWindow;
 
   bool m_hasReceivedUserGesture = false;
   bool m_isDetaching = false;
 
  private:
   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)
 
 }  // namespace blink
 
 #endif  // Frame_h