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

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

Issue 13976008: Remove more #includes from Frame.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase 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/DOMWindow.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 11 matching lines...) Expand all
22 * You should have received a copy of the GNU Library General Public License 22 * You should have received a copy of the GNU Library General Public License
23 * along with this library; see the file COPYING.LIB. If not, write to 23 * along with this library; see the file COPYING.LIB. If not, write to
24 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 24 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
25 * Boston, MA 02110-1301, USA. 25 * Boston, MA 02110-1301, USA.
26 */ 26 */
27 27
28 #ifndef Frame_h 28 #ifndef Frame_h
29 #define Frame_h 29 #define Frame_h
30 30
31 #include "AdjustViewSizeOrNot.h" 31 #include "AdjustViewSizeOrNot.h"
32 #include "AnimationController.h"
33 #include "DragImage.h" 32 #include "DragImage.h"
34 #include "Editor.h"
35 #include "EventHandler.h"
36 #include "FrameLoader.h" 33 #include "FrameLoader.h"
37 #include "FrameSelection.h"
38 #include "FrameTree.h" 34 #include "FrameTree.h"
35 #include "IntRect.h"
39 #include "NavigationScheduler.h" 36 #include "NavigationScheduler.h"
37 #include "ScrollTypes.h"
38 #include <wtf/RefCounted.h>
40 39
41 namespace WebCore { 40 namespace WebCore {
42 41
42 class AnimationController;
43 class Color;
43 class Document; 44 class Document;
45 class Editor;
46 class Element;
47 class EventHandler;
44 class FrameDestructionObserver; 48 class FrameDestructionObserver;
49 class FrameSelection;
45 class FrameView; 50 class FrameView;
46 class HTMLTableCellElement; 51 class HTMLTableCellElement;
52 class IntRect;
53 class Node;
47 class RegularExpression; 54 class RegularExpression;
48 class RenderPart; 55 class RenderPart;
56 class RenderView;
49 class TreeScope; 57 class TreeScope;
50 class ScriptController; 58 class ScriptController;
59 class Settings;
60 class TreeScope;
61 class VisiblePosition;
51 62
52 enum { 63 enum {
53 LayerTreeFlagsIncludeDebugInfo = 1 << 0, 64 LayerTreeFlagsIncludeDebugInfo = 1 << 0,
54 LayerTreeFlagsIncludeVisibleRects = 1 << 1, 65 LayerTreeFlagsIncludeVisibleRects = 1 << 1,
55 LayerTreeFlagsIncludeTileCaches = 1 << 2, 66 LayerTreeFlagsIncludeTileCaches = 1 << 2,
56 LayerTreeFlagsIncludeRepaintRects = 1 << 3, 67 LayerTreeFlagsIncludeRepaintRects = 1 << 3,
57 LayerTreeFlagsIncludePaintingPhases = 1 << 4 68 LayerTreeFlagsIncludePaintingPhases = 1 << 4
58 }; 69 };
59 typedef unsigned LayerTreeFlags; 70 typedef unsigned LayerTreeFlags;
60 71
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 Page* m_page; 182 Page* m_page;
172 mutable FrameTree m_treeNode; 183 mutable FrameTree m_treeNode;
173 mutable FrameLoader m_loader; 184 mutable FrameLoader m_loader;
174 mutable NavigationScheduler m_navigationScheduler; 185 mutable NavigationScheduler m_navigationScheduler;
175 186
176 HTMLFrameOwnerElement* m_ownerElement; 187 HTMLFrameOwnerElement* m_ownerElement;
177 RefPtr<FrameView> m_view; 188 RefPtr<FrameView> m_view;
178 RefPtr<Document> m_doc; 189 RefPtr<Document> m_doc;
179 190
180 OwnPtr<ScriptController> m_script; 191 OwnPtr<ScriptController> m_script;
181 192 OwnPtr<Editor> m_editor;
182 mutable Editor m_editor; 193 OwnPtr<FrameSelection> m_selection;
183 mutable FrameSelection m_selection; 194 OwnPtr<EventHandler> m_eventHandler;
184 mutable EventHandler m_eventHandler; 195 OwnPtr<AnimationController> m_animationController;
185 mutable AnimationController m_animationController;
186 196
187 float m_pageZoomFactor; 197 float m_pageZoomFactor;
188 float m_textZoomFactor; 198 float m_textZoomFactor;
189 199
190 #if ENABLE(ORIENTATION_EVENTS) 200 #if ENABLE(ORIENTATION_EVENTS)
191 int m_orientation; 201 int m_orientation;
192 #endif 202 #endif
193 203
194 bool m_inViewSourceMode; 204 bool m_inViewSourceMode;
195 }; 205 };
(...skipping 23 matching lines...) Expand all
219 return m_script.get(); 229 return m_script.get();
220 } 230 }
221 231
222 inline Document* Frame::document() const 232 inline Document* Frame::document() const
223 { 233 {
224 return m_doc.get(); 234 return m_doc.get();
225 } 235 }
226 236
227 inline FrameSelection* Frame::selection() const 237 inline FrameSelection* Frame::selection() const
228 { 238 {
229 return &m_selection; 239 return m_selection.get();
230 } 240 }
231 241
232 inline Editor* Frame::editor() const 242 inline Editor* Frame::editor() const
233 { 243 {
234 return &m_editor; 244 return m_editor.get();
235 } 245 }
236 246
237 inline AnimationController* Frame::animation() const 247 inline AnimationController* Frame::animation() const
238 { 248 {
239 return &m_animationController; 249 return m_animationController.get();
240 } 250 }
241 251
242 inline HTMLFrameOwnerElement* Frame::ownerElement() const 252 inline HTMLFrameOwnerElement* Frame::ownerElement() const
243 { 253 {
244 return m_ownerElement; 254 return m_ownerElement;
245 } 255 }
246 256
247 inline bool Frame::inViewSourceMode() const 257 inline bool Frame::inViewSourceMode() const
248 { 258 {
249 return m_inViewSourceMode; 259 return m_inViewSourceMode;
(...skipping 14 matching lines...) Expand all
264 return m_page; 274 return m_page;
265 } 275 }
266 276
267 inline void Frame::detachFromPage() 277 inline void Frame::detachFromPage()
268 { 278 {
269 m_page = 0; 279 m_page = 0;
270 } 280 }
271 281
272 inline EventHandler* Frame::eventHandler() const 282 inline EventHandler* Frame::eventHandler() const
273 { 283 {
274 return &m_eventHandler; 284 return m_eventHandler.get();
275 } 285 }
276 286
277 } // namespace WebCore 287 } // namespace WebCore
278 288
279 #endif // Frame_h 289 #endif // Frame_h
OLDNEW
« no previous file with comments | « Source/core/page/DOMWindow.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698