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

Side by Side Diff: Source/core/frame/Frame.h

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added alias for LocalFrame downcast Created 6 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual void detachFromFrameHost(); 62 virtual void detachFromFrameHost();
63 63
64 // NOTE: Page is moving out of Blink up into the browser process as 64 // NOTE: Page is moving out of Blink up into the browser process as
65 // part of the site-isolation (out of process iframes) work. 65 // part of the site-isolation (out of process iframes) work.
66 // FrameHost should be used instead where possible. 66 // FrameHost should be used instead where possible.
67 Page* page() const; 67 Page* page() const;
68 FrameHost* host() const; // Null when the frame is detached. 68 FrameHost* host() const; // Null when the frame is detached.
69 69
70 bool isMainFrame() const; 70 bool isMainFrame() const;
71 71
72 void disconnectOwnerElement();
73
74 HTMLFrameOwnerElement* ownerElement() const;
75
72 // FIXME: DOMWindow and Document should both be moved to LocalFrame 76 // FIXME: DOMWindow and Document should both be moved to LocalFrame
73 // after RemoteFrame is complete enough to exist without them. 77 // after RemoteFrame is complete enough to exist without them.
74 virtual void setDOMWindow(PassRefPtr<DOMWindow>); 78 virtual void setDOMWindow(PassRefPtr<DOMWindow>);
75 DOMWindow* domWindow() const; 79 DOMWindow* domWindow() const;
76 Document* document() const; 80 Document* document() const;
77 81
78 ChromeClient& chromeClient() const; 82 ChromeClient& chromeClient() const;
79 83
80 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame. 84 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame.
81 85
(...skipping 20 matching lines...) Expand all
102 // Temporary hack for history. 106 // Temporary hack for history.
103 int64_t m_frameID; 107 int64_t m_frameID;
104 108
105 blink::WebLayer* m_remotePlatformLayer; 109 blink::WebLayer* m_remotePlatformLayer;
106 }; 110 };
107 111
108 inline DOMWindow* Frame::domWindow() const 112 inline DOMWindow* Frame::domWindow() const
109 { 113 {
110 return m_domWindow.get(); 114 return m_domWindow.get();
111 } 115 }
116
117 inline HTMLFrameOwnerElement* Frame::ownerElement() const
118 {
119 return m_ownerElement;
120 }
121
112 } // namespace WebCore 122 } // namespace WebCore
113 123
114 #endif // Frame_h 124 #endif // Frame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698