Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: Source/core/frame/Frame.h

Issue 334283004: Rename DOMWindow to LocalDOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/EventHandlerRegistry.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.h
diff --git a/Source/core/frame/Frame.h b/Source/core/frame/Frame.h
index 3727aa32a97345c082b3aa426d3163f9fa77083c..c6cb1f96cfc9d9030bf526326a31c6a3f5c08073 100644
--- a/Source/core/frame/Frame.h
+++ b/Source/core/frame/Frame.h
@@ -41,12 +41,12 @@ class WebLayer;
namespace WebCore {
class ChromeClient;
-class DOMWindow;
class FrameClient;
class FrameDestructionObserver;
class FrameHost;
class FrameOwner;
class HTMLFrameOwnerElement;
+class LocalDOMWindow;
class Page;
class RenderPart;
class Settings;
@@ -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();
}
« no previous file with comments | « Source/core/frame/EventHandlerRegistry.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698