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

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

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 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/page/EventSource.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 19 matching lines...) Expand all
30 30
31 #include "AdjustViewSizeOrNot.h" 31 #include "AdjustViewSizeOrNot.h"
32 #include "AnimationController.h" 32 #include "AnimationController.h"
33 #include "DragImage.h" 33 #include "DragImage.h"
34 #include "Editor.h" 34 #include "Editor.h"
35 #include "EventHandler.h" 35 #include "EventHandler.h"
36 #include "FrameLoader.h" 36 #include "FrameLoader.h"
37 #include "FrameSelection.h" 37 #include "FrameSelection.h"
38 #include "FrameTree.h" 38 #include "FrameTree.h"
39 #include "NavigationScheduler.h" 39 #include "NavigationScheduler.h"
40 #include "ScriptController.h"
41 40
42 namespace WebCore { 41 namespace WebCore {
43 42
44 class Document; 43 class Document;
45 class FrameDestructionObserver; 44 class FrameDestructionObserver;
46 class FrameView; 45 class FrameView;
47 class HTMLTableCellElement; 46 class HTMLTableCellElement;
48 class RegularExpression; 47 class RegularExpression;
49 class RenderPart; 48 class RenderPart;
50
51 class TreeScope; 49 class TreeScope;
50 class ScriptController;
52 51
53 enum { 52 enum {
54 LayerTreeFlagsIncludeDebugInfo = 1 << 0, 53 LayerTreeFlagsIncludeDebugInfo = 1 << 0,
55 LayerTreeFlagsIncludeVisibleRects = 1 << 1, 54 LayerTreeFlagsIncludeVisibleRects = 1 << 1,
56 LayerTreeFlagsIncludeTileCaches = 1 << 2, 55 LayerTreeFlagsIncludeTileCaches = 1 << 2,
57 LayerTreeFlagsIncludeRepaintRects = 1 << 3, 56 LayerTreeFlagsIncludeRepaintRects = 1 << 3,
58 LayerTreeFlagsIncludePaintingPhases = 1 << 4 57 LayerTreeFlagsIncludePaintingPhases = 1 << 4
59 }; 58 };
60 typedef unsigned LayerTreeFlags; 59 typedef unsigned LayerTreeFlags;
61 60
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 170
172 Page* m_page; 171 Page* m_page;
173 mutable FrameTree m_treeNode; 172 mutable FrameTree m_treeNode;
174 mutable FrameLoader m_loader; 173 mutable FrameLoader m_loader;
175 mutable NavigationScheduler m_navigationScheduler; 174 mutable NavigationScheduler m_navigationScheduler;
176 175
177 HTMLFrameOwnerElement* m_ownerElement; 176 HTMLFrameOwnerElement* m_ownerElement;
178 RefPtr<FrameView> m_view; 177 RefPtr<FrameView> m_view;
179 RefPtr<Document> m_doc; 178 RefPtr<Document> m_doc;
180 179
181 ScriptController m_script; 180 OwnPtr<ScriptController> m_script;
182 181
183 mutable Editor m_editor; 182 mutable Editor m_editor;
184 mutable FrameSelection m_selection; 183 mutable FrameSelection m_selection;
185 mutable EventHandler m_eventHandler; 184 mutable EventHandler m_eventHandler;
186 mutable AnimationController m_animationController; 185 mutable AnimationController m_animationController;
187 186
188 float m_pageZoomFactor; 187 float m_pageZoomFactor;
189 float m_textZoomFactor; 188 float m_textZoomFactor;
190 189
191 #if ENABLE(ORIENTATION_EVENTS) 190 #if ENABLE(ORIENTATION_EVENTS)
(...skipping 18 matching lines...) Expand all
210 return &m_navigationScheduler; 209 return &m_navigationScheduler;
211 } 210 }
212 211
213 inline FrameView* Frame::view() const 212 inline FrameView* Frame::view() const
214 { 213 {
215 return m_view.get(); 214 return m_view.get();
216 } 215 }
217 216
218 inline ScriptController* Frame::script() 217 inline ScriptController* Frame::script()
219 { 218 {
220 return &m_script; 219 return m_script.get();
221 } 220 }
222 221
223 inline Document* Frame::document() const 222 inline Document* Frame::document() const
224 { 223 {
225 return m_doc.get(); 224 return m_doc.get();
226 } 225 }
227 226
228 inline FrameSelection* Frame::selection() const 227 inline FrameSelection* Frame::selection() const
229 { 228 {
230 return &m_selection; 229 return &m_selection;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 } 270 }
272 271
273 inline EventHandler* Frame::eventHandler() const 272 inline EventHandler* Frame::eventHandler() const
274 { 273 {
275 return &m_eventHandler; 274 return &m_eventHandler;
276 } 275 }
277 276
278 } // namespace WebCore 277 } // namespace WebCore
279 278
280 #endif // Frame_h 279 #endif // Frame_h
OLDNEW
« no previous file with comments | « Source/core/page/EventSource.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698