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

Side by Side Diff: Source/core/frame/LocalFrame.h

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase upto and resolve r182737 conflict. Created 6 years, 2 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) 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 class TreeScope; 63 class TreeScope;
64 class VisiblePosition; 64 class VisiblePosition;
65 65
66 class LocalFrame : public Frame, public WillBeHeapSupplementable<LocalFrame> { 66 class LocalFrame : public Frame, public WillBeHeapSupplementable<LocalFrame> {
67 public: 67 public:
68 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, Fra meHost*, FrameOwner*); 68 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, Fra meHost*, FrameOwner*);
69 69
70 virtual bool isLocalFrame() const OVERRIDE { return true; } 70 virtual bool isLocalFrame() const OVERRIDE { return true; }
71 71
72 void init(); 72 void init();
73 void setView(PassRefPtr<FrameView>); 73 void setView(PassRefPtrWillBeRawPtr<FrameView>);
74 void createView(const IntSize&, const Color&, bool, 74 void createView(const IntSize&, const Color&, bool,
75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, 75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
77 77
78 virtual ~LocalFrame(); 78 virtual ~LocalFrame();
79 virtual void trace(Visitor*) OVERRIDE; 79 virtual void trace(Visitor*) OVERRIDE;
80 80
81 virtual void detach() OVERRIDE; 81 virtual void detach() OVERRIDE;
82 82
83 void addDestructionObserver(FrameDestructionObserver*); 83 void addDestructionObserver(FrameDestructionObserver*);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); 161 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
162 162
163 String localLayerTreeAsText(unsigned flags) const; 163 String localLayerTreeAsText(unsigned flags) const;
164 164
165 void detachView(); 165 void detachView();
166 166
167 WillBeHeapHashSet<RawPtrWillBeWeakMember<FrameDestructionObserver> > m_d estructionObservers; 167 WillBeHeapHashSet<RawPtrWillBeWeakMember<FrameDestructionObserver> > m_d estructionObservers;
168 mutable FrameLoader m_loader; 168 mutable FrameLoader m_loader;
169 mutable NavigationScheduler m_navigationScheduler; 169 mutable NavigationScheduler m_navigationScheduler;
170 170
171 RefPtr<FrameView> m_view; 171 RefPtrWillBeMember<FrameView> m_view;
172 // Usually 0. Non-null if this is the top frame of PagePopup. 172 // Usually 0. Non-null if this is the top frame of PagePopup.
173 RefPtrWillBeMember<Element> m_pagePopupOwner; 173 RefPtrWillBeMember<Element> m_pagePopupOwner;
174 174
175 OwnPtr<ScriptController> m_script; 175 OwnPtr<ScriptController> m_script;
176 const OwnPtrWillBeMember<Editor> m_editor; 176 const OwnPtrWillBeMember<Editor> m_editor;
177 const OwnPtrWillBeMember<SpellChecker> m_spellChecker; 177 const OwnPtrWillBeMember<SpellChecker> m_spellChecker;
178 const OwnPtrWillBeMember<FrameSelection> m_selection; 178 const OwnPtrWillBeMember<FrameSelection> m_selection;
179 const OwnPtrWillBeMember<EventHandler> m_eventHandler; 179 const OwnPtrWillBeMember<EventHandler> m_eventHandler;
180 const OwnPtrWillBeMember<FrameConsole> m_console; 180 const OwnPtrWillBeMember<FrameConsole> m_console;
181 OwnPtrWillBeMember<InputMethodController> m_inputMethodController; 181 OwnPtrWillBeMember<InputMethodController> m_inputMethodController;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 255 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
256 256
257 } // namespace blink 257 } // namespace blink
258 258
259 // During refactoring, there are some places where we need to do type conversion s that 259 // During refactoring, there are some places where we need to do type conversion s that
260 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 260 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
261 // At that time this #define will be removed and all the uses of it will need to be corrected. 261 // At that time this #define will be removed and all the uses of it will need to be corrected.
262 #define toLocalFrameTemporary toLocalFrame 262 #define toLocalFrameTemporary toLocalFrame
263 263
264 #endif // LocalFrame_h 264 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698