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

Side by Side Diff: third_party/WebKit/Source/core/frame/Frame.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 13 matching lines...) Expand all
24 * You should have received a copy of the GNU Library General Public License 24 * You should have received a copy of the GNU Library General Public License
25 * along with this library; see the file COPYING.LIB. If not, write to 25 * along with this library; see the file COPYING.LIB. If not, write to
26 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 26 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
27 * Boston, MA 02110-1301, USA. 27 * Boston, MA 02110-1301, USA.
28 */ 28 */
29 29
30 #include "core/frame/Frame.h" 30 #include "core/frame/Frame.h"
31 31
32 #include "core/dom/DocumentType.h" 32 #include "core/dom/DocumentType.h"
33 #include "core/events/Event.h" 33 #include "core/events/Event.h"
34 #include "core/frame/LocalDOMWindow.h"
34 #include "core/frame/FrameHost.h" 35 #include "core/frame/FrameHost.h"
35 #include "core/frame/LocalDOMWindow.h"
36 #include "core/frame/Settings.h" 36 #include "core/frame/Settings.h"
37 #include "core/html/HTMLFrameElementBase.h" 37 #include "core/html/HTMLFrameElementBase.h"
38 #include "core/input/EventHandler.h" 38 #include "core/input/EventHandler.h"
39 #include "core/inspector/InspectorInstrumentation.h" 39 #include "core/inspector/InspectorInstrumentation.h"
40 #include "core/inspector/InstanceCounters.h" 40 #include "core/inspector/InstanceCounters.h"
41 #include "core/layout/LayoutPart.h" 41 #include "core/layout/LayoutPart.h"
42 #include "core/loader/EmptyClients.h" 42 #include "core/loader/EmptyClients.h"
43 #include "core/loader/FrameLoaderClient.h" 43 #include "core/loader/FrameLoaderClient.h"
44 #include "core/page/FocusController.h" 44 #include "core/page/FocusController.h"
45 #include "core/page/Page.h" 45 #include "core/page/Page.h"
46 #include "platform/Histogram.h" 46 #include "platform/Histogram.h"
47 #include "platform/UserGestureIndicator.h" 47 #include "platform/UserGestureIndicator.h"
48 #include "wtf/PassOwnPtr.h"
48 49
49 namespace blink { 50 namespace blink {
50 51
51 using namespace HTMLNames; 52 using namespace HTMLNames;
52 53
53 Frame::~Frame() 54 Frame::~Frame()
54 { 55 {
55 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); 56 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter);
56 ASSERT(!m_owner); 57 ASSERT(!m_owner);
57 } 58 }
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 325
325 ASSERT(page()); 326 ASSERT(page());
326 327
327 if (m_owner) 328 if (m_owner)
328 m_owner->setContentFrame(*this); 329 m_owner->setContentFrame(*this);
329 else 330 else
330 page()->setMainFrame(this); 331 page()->setMainFrame(this);
331 } 332 }
332 333
333 } // namespace blink 334 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/FrameConsole.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698