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

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: Missed a null check 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
« no previous file with comments | « Source/core/editing/Editor.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 virtual void detachFromFrameHost(); 63 virtual void detachFromFrameHost();
64 64
65 // NOTE: Page is moving out of Blink up into the browser process as 65 // NOTE: Page is moving out of Blink up into the browser process as
66 // part of the site-isolation (out of process iframes) work. 66 // part of the site-isolation (out of process iframes) work.
67 // FrameHost should be used instead where possible. 67 // FrameHost should be used instead where possible.
68 Page* page() const; 68 Page* page() const;
69 FrameHost* host() const; // Null when the frame is detached. 69 FrameHost* host() const; // Null when the frame is detached.
70 70
71 bool isMainFrame() const; 71 bool isMainFrame() const;
72 72
73 void disconnectOwnerElement();
74
75 HTMLFrameOwnerElement* ownerElement() const;
76
73 // FIXME: DOMWindow and Document should both be moved to LocalFrame 77 // FIXME: DOMWindow and Document should both be moved to LocalFrame
74 // after RemoteFrame is complete enough to exist without them. 78 // after RemoteFrame is complete enough to exist without them.
75 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>); 79 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>);
76 DOMWindow* domWindow() const; 80 DOMWindow* domWindow() const;
77 Document* document() const; 81 Document* document() const;
78 82
79 ChromeClient& chromeClient() const; 83 ChromeClient& chromeClient() const;
80 84
81 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame. 85 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame.
82 86
(...skipping 20 matching lines...) Expand all
103 // Temporary hack for history. 107 // Temporary hack for history.
104 int64_t m_frameID; 108 int64_t m_frameID;
105 109
106 blink::WebLayer* m_remotePlatformLayer; 110 blink::WebLayer* m_remotePlatformLayer;
107 }; 111 };
108 112
109 inline DOMWindow* Frame::domWindow() const 113 inline DOMWindow* Frame::domWindow() const
110 { 114 {
111 return m_domWindow.get(); 115 return m_domWindow.get();
112 } 116 }
117
118 inline HTMLFrameOwnerElement* Frame::ownerElement() const
119 {
120 return m_ownerElement;
121 }
122
113 } // namespace WebCore 123 } // namespace WebCore
114 124
115 #endif // Frame_h 125 #endif // Frame_h
OLDNEW
« no previous file with comments | « Source/core/editing/Editor.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698