Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 121 | 121 |
| 122 ViewportDescription viewportDescription() const; | 122 ViewportDescription viewportDescription() const; |
| 123 | 123 |
| 124 static void refreshPlugins(bool reload); | 124 static void refreshPlugins(bool reload); |
| 125 PluginData* pluginData() const; | 125 PluginData* pluginData() const; |
| 126 | 126 |
| 127 EditorClient& editorClient() const { return *m_editorClient; } | 127 EditorClient& editorClient() const { return *m_editorClient; } |
| 128 SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClien t; } | 128 SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClien t; } |
| 129 UndoStack& undoStack() const { return *m_undoStack; } | 129 UndoStack& undoStack() const { return *m_undoStack; } |
| 130 | 130 |
| 131 void setMainFrame(PassRefPtr<Frame>); | 131 void setMainFrame(Frame*); |
| 132 Frame* mainFrame() const { return m_mainFrame.get(); } | 132 Frame* mainFrame() const { return m_mainFrame; } |
| 133 // Escape hatch for existing code that assumes that the root frame is | 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 | 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 | 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 | 136 // necessary state through all renderer processes for that page and/or |
| 137 // coordinate/rely on the browser process to help dispatch/coordinate work. | 137 // coordinate/rely on the browser process to help dispatch/coordinate work. |
| 138 LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFra me.get()); } | 138 LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFra me); } |
| 139 | 139 |
| 140 void documentDetached(Document*); | 140 void documentDetached(Document*); |
| 141 | 141 |
| 142 bool openedByDOM() const; | 142 bool openedByDOM() const; |
| 143 void setOpenedByDOM(); | 143 void setOpenedByDOM(); |
| 144 | 144 |
| 145 void incrementSubframeCount() { ++m_subframeCount; } | 145 void incrementSubframeCount() { ++m_subframeCount; } |
| 146 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; } | 146 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; } |
| 147 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; } | 147 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; } |
| 148 | 148 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 252 const OwnPtr<Chrome> m_chrome; | 252 const OwnPtr<Chrome> m_chrome; |
| 253 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController; | 253 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController; |
| 254 const OwnPtrWillBeMember<DragController> m_dragController; | 254 const OwnPtrWillBeMember<DragController> m_dragController; |
| 255 const OwnPtr<FocusController> m_focusController; | 255 const OwnPtr<FocusController> m_focusController; |
| 256 const OwnPtr<ContextMenuController> m_contextMenuController; | 256 const OwnPtr<ContextMenuController> m_contextMenuController; |
| 257 const OwnPtr<InspectorController> m_inspectorController; | 257 const OwnPtr<InspectorController> m_inspectorController; |
| 258 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController; | 258 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController; |
| 259 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator; | 259 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator; |
| 260 const OwnPtrWillBeMember<UndoStack> m_undoStack; | 260 const OwnPtrWillBeMember<UndoStack> m_undoStack; |
| 261 | 261 |
| 262 RefPtr<Frame> m_mainFrame; | 262 Frame* m_mainFrame; |
|
eseidel
2014/06/19 16:55:31
So the Page no longer owns its main frame. Someon
| |
| 263 | 263 |
| 264 mutable RefPtr<PluginData> m_pluginData; | 264 mutable RefPtr<PluginData> m_pluginData; |
| 265 | 265 |
| 266 BackForwardClient* m_backForwardClient; | 266 BackForwardClient* m_backForwardClient; |
| 267 EditorClient* const m_editorClient; | 267 EditorClient* const m_editorClient; |
| 268 SpellCheckerClient* const m_spellCheckerClient; | 268 SpellCheckerClient* const m_spellCheckerClient; |
| 269 StorageClient* m_storageClient; | 269 StorageClient* m_storageClient; |
| 270 OwnPtrWillBeMember<ValidationMessageClient> m_validationMessageClient; | 270 OwnPtrWillBeMember<ValidationMessageClient> m_validationMessageClient; |
| 271 | 271 |
| 272 UseCounter m_useCounter; | 272 UseCounter m_useCounter; |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 294 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers; | 294 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers; |
| 295 | 295 |
| 296 // 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. |
| 297 // FIXME: Most of the members of Page should move onto FrameHost. | 297 // FIXME: Most of the members of Page should move onto FrameHost. |
| 298 OwnPtrWillBeMember<FrameHost> m_frameHost; | 298 OwnPtrWillBeMember<FrameHost> m_frameHost; |
| 299 }; | 299 }; |
| 300 | 300 |
| 301 } // namespace WebCore | 301 } // namespace WebCore |
| 302 | 302 |
| 303 #endif // Page_h | 303 #endif // Page_h |
| OLD | NEW |