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

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

Issue 219903002: Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1917/
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual void detachFromFrameHost(); 64 virtual void detachFromFrameHost();
65 65
66 // NOTE: Page is moving out of Blink up into the browser process as 66 // NOTE: Page is moving out of Blink up into the browser process as
67 // part of the site-isolation (out of process iframes) work. 67 // part of the site-isolation (out of process iframes) work.
68 // FrameHost should be used instead where possible. 68 // FrameHost should be used instead where possible.
69 Page* page() const; 69 Page* page() const;
70 FrameHost* host() const; // Null when the frame is detached. 70 FrameHost* host() const; // Null when the frame is detached.
71 71
72 bool isMainFrame() const; 72 bool isMainFrame() const;
73 73
74 void disconnectOwnerElement();
75
76 HTMLFrameOwnerElement* ownerElement() const;
77
78 // FIXME: DOMWindow and Document should both be moved to LocalFrame 74 // FIXME: DOMWindow and Document should both be moved to LocalFrame
79 // after RemoteFrame is complete enough to exist without them. 75 // after RemoteFrame is complete enough to exist without them.
80 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>); 76 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>);
81 DOMWindow* domWindow() const; 77 DOMWindow* domWindow() const;
82 Document* document() const; 78 Document* document() const;
83 79
84 ChromeClient& chromeClient() const; 80 ChromeClient& chromeClient() const;
85 81
86 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame. 82 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame.
87 RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame. 83 RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
(...skipping 21 matching lines...) Expand all
109 // Temporary hack for history. 105 // Temporary hack for history.
110 int64_t m_frameID; 106 int64_t m_frameID;
111 107
112 blink::WebLayer* m_remotePlatformLayer; 108 blink::WebLayer* m_remotePlatformLayer;
113 }; 109 };
114 110
115 inline DOMWindow* Frame::domWindow() const 111 inline DOMWindow* Frame::domWindow() const
116 { 112 {
117 return m_domWindow.get(); 113 return m_domWindow.get();
118 } 114 }
119
120 inline HTMLFrameOwnerElement* Frame::ownerElement() const
121 {
122 return m_ownerElement;
123 }
124
125 } // namespace WebCore 115 } // namespace WebCore
126 116
127 #endif // Frame_h 117 #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