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

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

Issue 627933002: Oilpan: move ScriptController+WindowProxy to the heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Non-Oilpan compile fix 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 | Annotate | Revision Log
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 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 Frame* parent = frame->tree().parent(); 86 Frame* parent = frame->tree().parent();
87 if (!parent || !parent->isLocalFrame()) 87 if (!parent || !parent->isLocalFrame())
88 return 1; 88 return 1;
89 return toLocalFrame(parent)->textZoomFactor(); 89 return toLocalFrame(parent)->textZoomFactor();
90 } 90 }
91 91
92 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO wner* owner) 92 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO wner* owner)
93 : Frame(client, host, owner) 93 : Frame(client, host, owner)
94 , m_loader(this) 94 , m_loader(this)
95 , m_navigationScheduler(this) 95 , m_navigationScheduler(this)
96 , m_script(adoptPtr(new ScriptController(this))) 96 , m_script(ScriptController::create(this))
97 , m_editor(Editor::create(*this)) 97 , m_editor(Editor::create(*this))
98 , m_spellChecker(SpellChecker::create(*this)) 98 , m_spellChecker(SpellChecker::create(*this))
99 , m_selection(FrameSelection::create(this)) 99 , m_selection(FrameSelection::create(this))
100 , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this))) 100 , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this)))
101 , m_console(FrameConsole::create(*this)) 101 , m_console(FrameConsole::create(*this))
102 , m_inputMethodController(InputMethodController::create(*this)) 102 , m_inputMethodController(InputMethodController::create(*this))
103 , m_pageZoomFactor(parentPageZoomFactor(this)) 103 , m_pageZoomFactor(parentPageZoomFactor(this))
104 , m_textZoomFactor(parentTextZoomFactor(this)) 104 , m_textZoomFactor(parentTextZoomFactor(this))
105 , m_inViewSourceMode(false) 105 , m_inViewSourceMode(false)
106 { 106 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 #endif 139 #endif
140 } 140 }
141 141
142 void LocalFrame::trace(Visitor* visitor) 142 void LocalFrame::trace(Visitor* visitor)
143 { 143 {
144 #if ENABLE(OILPAN) 144 #if ENABLE(OILPAN)
145 visitor->trace(m_destructionObservers); 145 visitor->trace(m_destructionObservers);
146 visitor->trace(m_loader); 146 visitor->trace(m_loader);
147 visitor->trace(m_navigationScheduler); 147 visitor->trace(m_navigationScheduler);
148 visitor->trace(m_pagePopupOwner); 148 visitor->trace(m_pagePopupOwner);
149 visitor->trace(m_script);
149 visitor->trace(m_editor); 150 visitor->trace(m_editor);
150 visitor->trace(m_spellChecker); 151 visitor->trace(m_spellChecker);
151 visitor->trace(m_selection); 152 visitor->trace(m_selection);
152 visitor->trace(m_eventHandler); 153 visitor->trace(m_eventHandler);
153 visitor->trace(m_console); 154 visitor->trace(m_console);
154 visitor->trace(m_inputMethodController); 155 visitor->trace(m_inputMethodController);
155 HeapSupplementable<LocalFrame>::trace(visitor); 156 HeapSupplementable<LocalFrame>::trace(visitor);
156 #endif 157 #endif
157 Frame::trace(visitor); 158 Frame::trace(visitor);
158 } 159 }
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 732
732 return curFrame; 733 return curFrame;
733 } 734 }
734 735
735 void LocalFrame::setPagePopupOwner(Element& owner) 736 void LocalFrame::setPagePopupOwner(Element& owner)
736 { 737 {
737 m_pagePopupOwner = &owner; 738 m_pagePopupOwner = &owner;
738 } 739 }
739 740
740 } // namespace blink 741 } // namespace blink
OLDNEW
« Source/core/frame/LocalFrame.h ('K') | « Source/core/frame/LocalFrame.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698