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

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

Issue 33523002: Have Frame::script() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/DOMWindow.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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 Editor& editor() const; 98 Editor& editor() const;
99 EventHandler* eventHandler() const; 99 EventHandler* eventHandler() const;
100 FrameLoader* loader() const; 100 FrameLoader* loader() const;
101 NavigationScheduler* navigationScheduler() const; 101 NavigationScheduler* navigationScheduler() const;
102 FrameSelection& selection() const; 102 FrameSelection& selection() const;
103 FrameTree& tree() const; 103 FrameTree& tree() const;
104 AnimationController& animation() const; 104 AnimationController& animation() const;
105 InputMethodController& inputMethodController() const; 105 InputMethodController& inputMethodController() const;
106 FetchContext& fetchContext() const { return loader()->fetchContext(); } 106 FetchContext& fetchContext() const { return loader()->fetchContext(); }
107 ScriptController* script(); 107 ScriptController& script();
108 SpellChecker& spellChecker() const; 108 SpellChecker& spellChecker() const;
109 109
110 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. 110 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
111 RenderPart* ownerRenderer() const; // Renderer for the element that cont ains this frame. 111 RenderPart* ownerRenderer() const; // Renderer for the element that cont ains this frame.
112 112
113 void dispatchVisibilityStateChangeEvent(); 113 void dispatchVisibilityStateChangeEvent();
114 114
115 // ======== All public functions below this point are candidates to move out of Frame into another class. ======== 115 // ======== All public functions below this point are candidates to move out of Frame into another class. ========
116 116
117 bool inScope(TreeScope*) const; 117 bool inScope(TreeScope*) const;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 inline NavigationScheduler* Frame::navigationScheduler() const 210 inline NavigationScheduler* Frame::navigationScheduler() const
211 { 211 {
212 return &m_navigationScheduler; 212 return &m_navigationScheduler;
213 } 213 }
214 214
215 inline FrameView* Frame::view() const 215 inline FrameView* Frame::view() const
216 { 216 {
217 return m_view.get(); 217 return m_view.get();
218 } 218 }
219 219
220 inline ScriptController* Frame::script() 220 inline ScriptController& Frame::script()
221 { 221 {
222 return m_script.get(); 222 return *m_script;
223 } 223 }
224 224
225 inline DOMWindow* Frame::domWindow() const 225 inline DOMWindow* Frame::domWindow() const
226 { 226 {
227 return m_domWindow.get(); 227 return m_domWindow.get();
228 } 228 }
229 229
230 inline FrameSelection& Frame::selection() const 230 inline FrameSelection& Frame::selection() const
231 { 231 {
232 return *m_selection; 232 return *m_selection;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 278 }
279 279
280 inline EventHandler* Frame::eventHandler() const 280 inline EventHandler* Frame::eventHandler() const
281 { 281 {
282 return m_eventHandler.get(); 282 return m_eventHandler.get();
283 } 283 }
284 284
285 } // namespace WebCore 285 } // namespace WebCore
286 286
287 #endif // Frame_h 287 #endif // Frame_h
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698