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

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

Issue 68303004: [oilpan] Move EventHandler to the heap (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 1 month 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/page/EventHandler.cpp ('k') | Source/core/page/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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void detachFromPage(); 90 void detachFromPage();
91 void disconnectOwnerElement(); 91 void disconnectOwnerElement();
92 92
93 Page* page() const; 93 Page* page() const;
94 RESULT(HTMLFrameOwnerElement) ownerElement() const; 94 RESULT(HTMLFrameOwnerElement) ownerElement() const;
95 95
96 RESULT(Document) document() const; 96 RESULT(Document) document() const;
97 FrameView* view() const; 97 FrameView* view() const;
98 98
99 Editor* editor() const; 99 Editor* editor() const;
100 EventHandler* eventHandler() const; 100 RESULT(EventHandler) eventHandler() const;
101 FrameLoader* loader() const; 101 FrameLoader* loader() const;
102 NavigationScheduler* navigationScheduler() const; 102 NavigationScheduler* navigationScheduler() const;
103 FrameSelection* selection() const; 103 FrameSelection* selection() const;
104 FrameTree* tree() const; 104 FrameTree* tree() const;
105 AnimationController* animation() const; 105 AnimationController* animation() const;
106 ScriptController* script(); 106 ScriptController* script();
107 107
108 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. 108 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
109 RenderPart* ownerRenderer() const; // Renderer for the element that cont ains this frame. 109 RenderPart* ownerRenderer() const; // Renderer for the element that cont ains this frame.
110 110
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 mutable NavigationScheduler m_navigationScheduler; 180 mutable NavigationScheduler m_navigationScheduler;
181 181
182 // FIXME(oilpan): This should be a strong pointer. 182 // FIXME(oilpan): This should be a strong pointer.
183 HTMLFrameOwnerElement* m_ownerElement; 183 HTMLFrameOwnerElement* m_ownerElement;
184 RefPtr<FrameView> m_view; 184 RefPtr<FrameView> m_view;
185 ANNOTATED_FIELD(Persistent<Document>, m_doc); 185 ANNOTATED_FIELD(Persistent<Document>, m_doc);
186 186
187 OwnPtr<ScriptController> m_script; 187 OwnPtr<ScriptController> m_script;
188 OwnPtr<Editor> m_editor; 188 OwnPtr<Editor> m_editor;
189 OwnPtr<FrameSelection> m_selection; 189 OwnPtr<FrameSelection> m_selection;
190 OwnPtr<EventHandler> m_eventHandler; 190 ANNOTATED_FIELD(Persistent<EventHandler>, m_eventHandler);
191 OwnPtr<AnimationController> m_animationController; 191 OwnPtr<AnimationController> m_animationController;
192 192
193 float m_pageZoomFactor; 193 float m_pageZoomFactor;
194 float m_textZoomFactor; 194 float m_textZoomFactor;
195 195
196 #if ENABLE(ORIENTATION_EVENTS) 196 #if ENABLE(ORIENTATION_EVENTS)
197 int m_orientation; 197 int m_orientation;
198 #endif 198 #endif
199 199
200 bool m_inViewSourceMode; 200 bool m_inViewSourceMode;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 inline Page* Frame::page() const 263 inline Page* Frame::page() const
264 { 264 {
265 return m_page; 265 return m_page;
266 } 266 }
267 267
268 inline void Frame::detachFromPage() 268 inline void Frame::detachFromPage()
269 { 269 {
270 m_page = 0; 270 m_page = 0;
271 } 271 }
272 272
273 inline EventHandler* Frame::eventHandler() const 273 inline RESULT(EventHandler) Frame::eventHandler() const
274 { 274 {
275 return m_eventHandler.get(); 275 return m_eventHandler;
276 } 276 }
277 277
278 } // namespace WebCore 278 } // namespace WebCore
279 279
280 #endif // Frame_h 280 #endif // Frame_h
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698