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

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

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Back out non-Oilpan experiment + tidy up by adding frame() ref accessors Created 6 years, 3 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
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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 void setNeedsLayoutInAllFrames(); 247 void setNeedsLayoutInAllFrames();
248 248
249 // SettingsDelegate overrides. 249 // SettingsDelegate overrides.
250 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE; 250 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE;
251 251
252 PageAnimator m_animator; 252 PageAnimator m_animator;
253 const OwnPtr<AutoscrollController> m_autoscrollController; 253 const OwnPtr<AutoscrollController> m_autoscrollController;
254 const OwnPtr<Chrome> m_chrome; 254 const OwnPtr<Chrome> m_chrome;
255 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController; 255 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController;
256 const OwnPtrWillBeMember<DragController> m_dragController; 256 const OwnPtrWillBeMember<DragController> m_dragController;
257 const OwnPtr<FocusController> m_focusController; 257 const OwnPtrWillBeMember<FocusController> m_focusController;
258 const OwnPtrWillBeMember<ContextMenuController> m_contextMenuController; 258 const OwnPtrWillBeMember<ContextMenuController> m_contextMenuController;
259 const OwnPtrWillBeMember<InspectorController> m_inspectorController; 259 const OwnPtrWillBeMember<InspectorController> m_inspectorController;
260 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController; 260 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController;
261 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator; 261 OwnPtr<ScrollingCoordinator> m_scrollingCoordinator;
262 const OwnPtrWillBeMember<UndoStack> m_undoStack; 262 const OwnPtrWillBeMember<UndoStack> m_undoStack;
263 263
264 // Typically, the main frame and Page should both be owned by the embedder, 264 // Typically, the main frame and Page should both be owned by the embedder,
265 // which must call Page::willBeDestroyed() prior to destroying Page. This 265 // which must call Page::willBeDestroyed() prior to destroying Page. This
266 // call detaches the main frame and clears this pointer, thus ensuring that 266 // call detaches the main frame and clears this pointer, thus ensuring that
267 // this field only references a live main frame. 267 // this field only references a live main frame.
268 // 268 //
269 // However, there are several locations (InspectorOverlay, SVGImage, and 269 // However, there are several locations (InspectorOverlay, SVGImage, and
270 // WebPagePopupImpl) which don't hold a reference to the main frame at all 270 // WebPagePopupImpl) which don't hold a reference to the main frame at all
271 // after creating it. These are still safe because they always create a 271 // after creating it. These are still safe because they always create a
272 // Frame with a FrameView. FrameView and Frame hold references to each 272 // Frame with a FrameView. FrameView and Frame hold references to each
273 // other, thus keeping each other alive. The call to willBeDestroyed() 273 // other, thus keeping each other alive. The call to willBeDestroyed()
274 // breaks this cycle, so the frame is still properly destroyed once no 274 // breaks this cycle, so the frame is still properly destroyed once no
275 // longer needed. 275 // longer needed.
276 Frame* m_mainFrame; 276 RawPtrWillBeMember<Frame> m_mainFrame;
277 277
278 mutable RefPtr<PluginData> m_pluginData; 278 mutable RefPtr<PluginData> m_pluginData;
279 279
280 BackForwardClient* m_backForwardClient; 280 BackForwardClient* m_backForwardClient;
281 EditorClient* const m_editorClient; 281 EditorClient* const m_editorClient;
282 SpellCheckerClient* const m_spellCheckerClient; 282 SpellCheckerClient* const m_spellCheckerClient;
283 StorageClient* m_storageClient; 283 StorageClient* m_storageClient;
284 OwnPtrWillBeMember<ValidationMessageClient> m_validationMessageClient; 284 OwnPtrWillBeMember<ValidationMessageClient> m_validationMessageClient;
285 285
286 UseCounter m_useCounter; 286 UseCounter m_useCounter;
(...skipping 21 matching lines...) Expand all
308 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers; 308 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers;
309 309
310 // A pointer to all the interfaces provided to in-process Frames for this Pa ge. 310 // A pointer to all the interfaces provided to in-process Frames for this Pa ge.
311 // FIXME: Most of the members of Page should move onto FrameHost. 311 // FIXME: Most of the members of Page should move onto FrameHost.
312 OwnPtrWillBeMember<FrameHost> m_frameHost; 312 OwnPtrWillBeMember<FrameHost> m_frameHost;
313 }; 313 };
314 314
315 } // namespace blink 315 } // namespace blink
316 316
317 #endif // Page_h 317 #endif // Page_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698