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

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

Issue 627933002: Oilpan: move ScriptController+WindowProxy to the heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Smaller fixes 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/core/v8/WindowProxy.cpp ('k') | Source/core/frame/LocalFrame.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 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. 98 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
99 99
100 Editor& editor() const; 100 Editor& editor() const;
101 EventHandler& eventHandler() const; 101 EventHandler& eventHandler() const;
102 FrameLoader& loader() const; 102 FrameLoader& loader() const;
103 NavigationScheduler& navigationScheduler() const; 103 NavigationScheduler& navigationScheduler() const;
104 FrameSelection& selection() const; 104 FrameSelection& selection() 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() const;
108 SpellChecker& spellChecker() const; 108 SpellChecker& spellChecker() const;
109 FrameConsole& console() const; 109 FrameConsole& console() const;
110 110
111 void didChangeVisibilityState(); 111 void didChangeVisibilityState();
112 112
113 // FIXME: This method is only used by EventHandler to get the highest le vel 113 // FIXME: This method is only used by EventHandler to get the highest le vel
114 // LocalFrame in this frame's in-process subtree. When user gesture toke ns 114 // LocalFrame in this frame's in-process subtree. When user gesture toke ns
115 // are synchronized across processes this method should be removed. 115 // are synchronized across processes this method should be removed.
116 LocalFrame* localFrameRoot(); 116 LocalFrame* localFrameRoot();
117 117
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 void detachView(); 166 void detachView();
167 167
168 WillBeHeapHashSet<RawPtrWillBeWeakMember<FrameDestructionObserver> > m_d estructionObservers; 168 WillBeHeapHashSet<RawPtrWillBeWeakMember<FrameDestructionObserver> > m_d estructionObservers;
169 mutable FrameLoader m_loader; 169 mutable FrameLoader m_loader;
170 mutable NavigationScheduler m_navigationScheduler; 170 mutable NavigationScheduler m_navigationScheduler;
171 171
172 RefPtr<FrameView> m_view; 172 RefPtr<FrameView> m_view;
173 // Usually 0. Non-null if this is the top frame of PagePopup. 173 // Usually 0. Non-null if this is the top frame of PagePopup.
174 RefPtrWillBeMember<Element> m_pagePopupOwner; 174 RefPtrWillBeMember<Element> m_pagePopupOwner;
175 175
176 OwnPtr<ScriptController> m_script; 176 const OwnPtrWillBeMember<ScriptController> m_script;
177 const OwnPtrWillBeMember<Editor> m_editor; 177 const OwnPtrWillBeMember<Editor> m_editor;
178 const OwnPtrWillBeMember<SpellChecker> m_spellChecker; 178 const OwnPtrWillBeMember<SpellChecker> m_spellChecker;
179 const OwnPtrWillBeMember<FrameSelection> m_selection; 179 const OwnPtrWillBeMember<FrameSelection> m_selection;
180 const OwnPtrWillBeMember<EventHandler> m_eventHandler; 180 const OwnPtrWillBeMember<EventHandler> m_eventHandler;
181 const OwnPtrWillBeMember<FrameConsole> m_console; 181 const OwnPtrWillBeMember<FrameConsole> m_console;
182 OwnPtrWillBeMember<InputMethodController> m_inputMethodController; 182 OwnPtrWillBeMember<InputMethodController> m_inputMethodController;
183 183
184 float m_pageZoomFactor; 184 float m_pageZoomFactor;
185 float m_textZoomFactor; 185 float m_textZoomFactor;
186 186
(...skipping 13 matching lines...) Expand all
200 inline NavigationScheduler& LocalFrame::navigationScheduler() const 200 inline NavigationScheduler& LocalFrame::navigationScheduler() const
201 { 201 {
202 return m_navigationScheduler; 202 return m_navigationScheduler;
203 } 203 }
204 204
205 inline FrameView* LocalFrame::view() const 205 inline FrameView* LocalFrame::view() const
206 { 206 {
207 return m_view.get(); 207 return m_view.get();
208 } 208 }
209 209
210 inline ScriptController& LocalFrame::script() 210 inline ScriptController& LocalFrame::script() const
211 { 211 {
212 return *m_script; 212 return *m_script;
213 } 213 }
214 214
215 inline FrameSelection& LocalFrame::selection() const 215 inline FrameSelection& LocalFrame::selection() const
216 { 216 {
217 return *m_selection; 217 return *m_selection;
218 } 218 }
219 219
220 inline Editor& LocalFrame::editor() const 220 inline Editor& LocalFrame::editor() const
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 256 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
257 257
258 } // namespace blink 258 } // namespace blink
259 259
260 // During refactoring, there are some places where we need to do type conversion s that 260 // During refactoring, there are some places where we need to do type conversion s that
261 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 261 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
262 // At that time this #define will be removed and all the uses of it will need to be corrected. 262 // At that time this #define will be removed and all the uses of it will need to be corrected.
263 #define toLocalFrameTemporary toLocalFrame 263 #define toLocalFrameTemporary toLocalFrame
264 264
265 #endif // LocalFrame_h 265 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/WindowProxy.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698