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

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: Rebased 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
« no previous file with comments | « Source/core/page/FocusController.cpp ('k') | Source/core/page/Page.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) 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #ifndef Page_h 21 #ifndef Page_h
22 #define Page_h 22 #define Page_h
23 23
24 #include "core/dom/ViewportDescription.h" 24 #include "core/dom/ViewportDescription.h"
25 #include "core/frame/LocalFrame.h"
25 #include "core/frame/SettingsDelegate.h" 26 #include "core/frame/SettingsDelegate.h"
26 #include "core/frame/UseCounter.h" 27 #include "core/frame/UseCounter.h"
27 #include "core/page/PageAnimator.h" 28 #include "core/page/PageAnimator.h"
28 #include "core/page/PageVisibilityState.h" 29 #include "core/page/PageVisibilityState.h"
29 #include "platform/LifecycleContext.h" 30 #include "platform/LifecycleContext.h"
30 #include "platform/Supplementable.h" 31 #include "platform/Supplementable.h"
31 #include "platform/geometry/LayoutRect.h" 32 #include "platform/geometry/LayoutRect.h"
32 #include "platform/geometry/Region.h" 33 #include "platform/geometry/Region.h"
33 #include "platform/heap/Handle.h" 34 #include "platform/heap/Handle.h"
34 #include "wtf/Forward.h" 35 #include "wtf/Forward.h"
35 #include "wtf/HashSet.h" 36 #include "wtf/HashSet.h"
36 #include "wtf/Noncopyable.h" 37 #include "wtf/Noncopyable.h"
37 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
38 39
39 namespace WebCore { 40 namespace WebCore {
40 41
41 class AutoscrollController; 42 class AutoscrollController;
42 class BackForwardClient; 43 class BackForwardClient;
43 class Chrome; 44 class Chrome;
44 class ChromeClient; 45 class ChromeClient;
45 class ClientRectList; 46 class ClientRectList;
46 class ContextMenuClient; 47 class ContextMenuClient;
47 class ContextMenuController; 48 class ContextMenuController;
48 class Document; 49 class Document;
49 class DragCaretController; 50 class DragCaretController;
50 class DragClient; 51 class DragClient;
51 class DragController; 52 class DragController;
52 class EditorClient; 53 class EditorClient;
53 class FocusController; 54 class FocusController;
54 class LocalFrame; 55 class Frame;
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;
64 class RenderBox; 65 class RenderBox;
(...skipping 55 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(); }
133 // Escape hatch for existing code that assumes that the root frame is
134 // always a LocalFrame. With OOPI, this is not always the case. Code that
135 // depends on this will generally have to be rewritten to propagate any
136 // necessary state through all renderer processes for that page and/or
137 // coordinate/rely on the browser process to help dispatch/coordinate work.
138 LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFra me.get()); }
132 139
133 void documentDetached(Document*); 140 void documentDetached(Document*);
134 141
135 bool openedByDOM() const; 142 bool openedByDOM() const;
136 void setOpenedByDOM(); 143 void setOpenedByDOM();
137 144
138 void incrementSubframeCount() { ++m_subframeCount; } 145 void incrementSubframeCount() { ++m_subframeCount; }
139 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; } 146 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
140 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; } 147 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; }
141 148
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 const OwnPtr<Chrome> m_chrome; 252 const OwnPtr<Chrome> m_chrome;
246 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController; 253 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController;
247 const OwnPtrWillBeMember<DragController> m_dragController; 254 const OwnPtrWillBeMember<DragController> m_dragController;
248 const OwnPtr<FocusController> m_focusController; 255 const OwnPtr<FocusController> m_focusController;
249 const OwnPtr<ContextMenuController> m_contextMenuController; 256 const OwnPtr<ContextMenuController> m_contextMenuController;
250 const OwnPtr<InspectorController> m_inspectorController; 257 const OwnPtr<InspectorController> m_inspectorController;
251 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController; 258 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController;
252 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator; 259 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator;
253 const OwnPtr<UndoStack> m_undoStack; 260 const OwnPtr<UndoStack> m_undoStack;
254 261
255 RefPtr<LocalFrame> m_mainFrame; 262 RefPtr<Frame> m_mainFrame;
256 263
257 mutable RefPtr<PluginData> m_pluginData; 264 mutable RefPtr<PluginData> m_pluginData;
258 265
259 BackForwardClient* m_backForwardClient; 266 BackForwardClient* m_backForwardClient;
260 EditorClient* const m_editorClient; 267 EditorClient* const m_editorClient;
261 SpellCheckerClient* const m_spellCheckerClient; 268 SpellCheckerClient* const m_spellCheckerClient;
262 StorageClient* m_storageClient; 269 StorageClient* m_storageClient;
263 OwnPtr<ValidationMessageClient> m_validationMessageClient; 270 OwnPtr<ValidationMessageClient> m_validationMessageClient;
264 271
265 UseCounter m_useCounter; 272 UseCounter m_useCounter;
(...skipping 21 matching lines...) Expand all
287 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers; 294 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers;
288 295
289 // A pointer to all the interfaces provided to in-process Frames for this Pa ge. 296 // 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. 297 // FIXME: Most of the members of Page should move onto FrameHost.
291 OwnPtrWillBeMember<FrameHost> m_frameHost; 298 OwnPtrWillBeMember<FrameHost> m_frameHost;
292 }; 299 };
293 300
294 } // namespace WebCore 301 } // namespace WebCore
295 302
296 #endif // Page_h 303 #endif // Page_h
OLDNEW
« no previous file with comments | « Source/core/page/FocusController.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698