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

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

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Android/Mac fixes Created 6 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class ChromeClient; 44 class ChromeClient;
45 class ClientRectList; 45 class ClientRectList;
46 class ContextMenuClient; 46 class ContextMenuClient;
47 class ContextMenuController; 47 class ContextMenuController;
48 class Document; 48 class Document;
49 class DragCaretController; 49 class DragCaretController;
50 class DragClient; 50 class DragClient;
51 class DragController; 51 class DragController;
52 class EditorClient; 52 class EditorClient;
53 class FocusController; 53 class FocusController;
54 class Frame;
54 class LocalFrame; 55 class LocalFrame;
55 class FrameHost; 56 class FrameHost;
56 class HistoryItem; 57 class HistoryItem;
57 class InspectorClient; 58 class InspectorClient;
58 class InspectorController; 59 class InspectorController;
59 class PageLifecycleNotifier; 60 class PageLifecycleNotifier;
60 class PlatformMouseEvent; 61 class PlatformMouseEvent;
61 class PluginData; 62 class PluginData;
62 class PointerLockController; 63 class PointerLockController;
63 class Range; 64 class Range;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 121
121 ViewportDescription viewportDescription() const; 122 ViewportDescription viewportDescription() const;
122 123
123 static void refreshPlugins(bool reload); 124 static void refreshPlugins(bool reload);
124 PluginData* pluginData() const; 125 PluginData* pluginData() const;
125 126
126 EditorClient& editorClient() const { return *m_editorClient; } 127 EditorClient& editorClient() const { return *m_editorClient; }
127 SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClien t; } 128 SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClien t; }
128 UndoStack& undoStack() const { return *m_undoStack; } 129 UndoStack& undoStack() const { return *m_undoStack; }
129 130
130 void setMainFrame(PassRefPtr<LocalFrame>); 131 void setMainFrame(PassRefPtr<Frame>);
131 LocalFrame* mainFrame() const { return m_mainFrame.get(); } 132 Frame* mainFrame() const { return m_mainFrame.get(); }
132 133
133 void documentDetached(Document*); 134 void documentDetached(Document*);
134 135
135 bool openedByDOM() const; 136 bool openedByDOM() const;
136 void setOpenedByDOM(); 137 void setOpenedByDOM();
137 138
138 void incrementSubframeCount() { ++m_subframeCount; } 139 void incrementSubframeCount() { ++m_subframeCount; }
139 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; } 140 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
140 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; } 141 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; }
141 142
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 const OwnPtr<Chrome> m_chrome; 246 const OwnPtr<Chrome> m_chrome;
246 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController; 247 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController;
247 const OwnPtrWillBeMember<DragController> m_dragController; 248 const OwnPtrWillBeMember<DragController> m_dragController;
248 const OwnPtr<FocusController> m_focusController; 249 const OwnPtr<FocusController> m_focusController;
249 const OwnPtr<ContextMenuController> m_contextMenuController; 250 const OwnPtr<ContextMenuController> m_contextMenuController;
250 const OwnPtr<InspectorController> m_inspectorController; 251 const OwnPtr<InspectorController> m_inspectorController;
251 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController; 252 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController;
252 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator; 253 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator;
253 const OwnPtr<UndoStack> m_undoStack; 254 const OwnPtr<UndoStack> m_undoStack;
254 255
255 RefPtr<LocalFrame> m_mainFrame; 256 RefPtr<Frame> m_mainFrame;
256 257
257 mutable RefPtr<PluginData> m_pluginData; 258 mutable RefPtr<PluginData> m_pluginData;
258 259
259 BackForwardClient* m_backForwardClient; 260 BackForwardClient* m_backForwardClient;
260 EditorClient* const m_editorClient; 261 EditorClient* const m_editorClient;
261 SpellCheckerClient* const m_spellCheckerClient; 262 SpellCheckerClient* const m_spellCheckerClient;
262 StorageClient* m_storageClient; 263 StorageClient* m_storageClient;
263 OwnPtr<ValidationMessageClient> m_validationMessageClient; 264 OwnPtr<ValidationMessageClient> m_validationMessageClient;
264 265
265 UseCounter m_useCounter; 266 UseCounter m_useCounter;
(...skipping 21 matching lines...) Expand all
287 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers; 288 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers;
288 289
289 // A pointer to all the interfaces provided to in-process Frames for this Pa ge. 290 // A pointer to all the interfaces provided to in-process Frames for this Pa ge.
290 // FIXME: Most of the members of Page should move onto FrameHost. 291 // FIXME: Most of the members of Page should move onto FrameHost.
291 OwnPtrWillBeMember<FrameHost> m_frameHost; 292 OwnPtrWillBeMember<FrameHost> m_frameHost;
292 }; 293 };
293 294
294 } // namespace WebCore 295 } // namespace WebCore
295 296
296 #endif // Page_h 297 #endif // Page_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698