Add a basic DOMWindow base class and use it in WindowProxy.

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)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 41 matching lines @@
 
 class Frame : public RefCountedWillBeGarbageCollectedFinalized<Frame> {
 public:
     virtual ~Frame();
 
     virtual void trace(Visitor*);
 
     virtual bool isLocalFrame() const { return false; }
     virtual bool isRemoteFrame() const { return false; }
 
+    // FIXME: This should return a DOMWindow*.
+    virtual LocalDOMWindow* domWindow() const = 0;
+
     virtual void navigate(Document& originDocument, const KURL&, bool lockBackForwardList) = 0;
 
     virtual void detach();
     void detachChildren();
     virtual void disconnectOwnerElement();
 
     FrameClient* client() const;
 
     // 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;
     void setOwner(FrameOwner* owner) { m_owner = owner; }
     HTMLFrameOwnerElement* deprecatedLocalOwner() const;
 
-    // FIXME: LocalDOMWindow and Document should both be moved to LocalFrame
-    // after RemoteFrame is complete enough to exist without them.
-    virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>);
-    LocalDOMWindow* domWindow() const;
-
     FrameTree& tree() const;
     ChromeClient& chromeClient() const;
 
     RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
 
     // FIXME: These should move to RemoteFrame when that is instantiated.
     void setRemotePlatformLayer(WebLayer*);
     WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
 
     Settings* settings() const; // can be null
 
     // FIXME: This method identifies a LocalFrame that is acting as a RemoteFrame.
     // It is necessary only until we can instantiate a RemoteFrame, at which point
     // it can be removed and its callers can be converted to use the isRemoteFrame()
     // method.
     bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; }
 
 protected:
     Frame(FrameClient*, FrameHost*, FrameOwner*);
 
     mutable FrameTree m_treeNode;
 
     RawPtrWillBeMember<FrameHost> m_host;
     RawPtrWillBeMember<FrameOwner> m_owner;
 
-    RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
-
 private:
     FrameClient* m_client;
     WebLayer* m_remotePlatformLayer;
 };
 
 inline FrameClient* Frame::client() const
 {
     return m_client;
 }
 
-inline LocalDOMWindow* Frame::domWindow() const
-{
-    return m_domWindow.get();
-}
-
 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_REFCOUNTED(Frame)
 
 } // namespace blink
 
 #endif // Frame_h