| Index: Source/core/frame/Frame.h
|
| diff --git a/Source/core/frame/Frame.h b/Source/core/frame/Frame.h
|
| index fcde271a927b92cae444480426825f439189f68a..31d03f3a51d5dfadd30e58a235644ff2735e3869 100644
|
| --- a/Source/core/frame/Frame.h
|
| +++ b/Source/core/frame/Frame.h
|
| @@ -41,7 +41,7 @@ class WebLayer;
|
|
|
| namespace WebCore {
|
|
|
| -class DOMWindow;
|
| +class LocalDOMWindow;
|
| class ChromeClient;
|
| class FrameClient;
|
| class FrameDestructionObserver;
|
| @@ -80,10 +80,10 @@ public:
|
| FrameOwner* owner() const;
|
| HTMLFrameOwnerElement* deprecatedLocalOwner() const;
|
|
|
| - // FIXME: DOMWindow and Document should both be moved to LocalFrame
|
| + // FIXME: LocalDOMWindow and Document should both be moved to LocalFrame
|
| // after RemoteFrame is complete enough to exist without them.
|
| - virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>);
|
| - DOMWindow* domWindow() const;
|
| + virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>);
|
| + LocalDOMWindow* domWindow() const;
|
|
|
| FrameTree& tree() const;
|
| ChromeClient& chromeClient() const;
|
| @@ -110,7 +110,7 @@ protected:
|
| FrameHost* m_host;
|
| FrameOwner* m_owner;
|
|
|
| - RefPtrWillBePersistent<DOMWindow> m_domWindow;
|
| + RefPtrWillBePersistent<LocalDOMWindow> m_domWindow;
|
|
|
| private:
|
| FrameClient* m_client;
|
| @@ -129,7 +129,7 @@ inline void Frame::clearClient()
|
| m_client = 0;
|
| }
|
|
|
| -inline DOMWindow* Frame::domWindow() const
|
| +inline LocalDOMWindow* Frame::domWindow() const
|
| {
|
| return m_domWindow.get();
|
| }
|
|
|