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

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

Issue 640803004: Add a basic DOMWindow base class and use it in WindowProxy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 6 years, 2 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/LocalDOMWindow.h ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.h
diff --git a/Source/core/frame/LocalFrame.h b/Source/core/frame/LocalFrame.h
index 5a2e45062f47c1dbee0526a68a16caec7596eeb5..419ad462e4f2a36ccbfe49bf964e6d9e18d4e00e 100644
--- a/Source/core/frame/LocalFrame.h
+++ b/Source/core/frame/LocalFrame.h
@@ -79,6 +79,7 @@ namespace blink {
virtual ~LocalFrame();
virtual void trace(Visitor*) override;
virtual bool isLocalFrame() const override { return true; }
+ virtual LocalDOMWindow* domWindow() const override;
virtual void navigate(Document& originDocument, const KURL&, bool lockBackForwardList) override;
virtual void detach() override;
virtual void disconnectOwnerElement() override;
@@ -88,7 +89,7 @@ namespace blink {
void willDetachFrameHost();
- virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) override;
+ void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>);
FrameView* view() const;
Document* document() const;
void setPagePopupOwner(Element&);
@@ -176,6 +177,7 @@ namespace blink {
mutable NavigationScheduler m_navigationScheduler;
RefPtrWillBeMember<FrameView> m_view;
+ RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
// Usually 0. Non-null if this is the top frame of PagePopup.
RefPtrWillBeMember<Element> m_pagePopupOwner;
« no previous file with comments | « Source/core/frame/LocalDOMWindow.h ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698