| OLD | NEW |
| 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 Loading... |
| 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/FrameHost.h" |
| 34 #include "core/frame/LocalDOMWindow.h" | 35 #include "core/frame/LocalDOMWindow.h" |
| 35 #include "core/frame/FrameHost.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" | |
| 49 | 48 |
| 50 namespace blink { | 49 namespace blink { |
| 51 | 50 |
| 52 using namespace HTMLNames; | 51 using namespace HTMLNames; |
| 53 | 52 |
| 54 Frame::~Frame() | 53 Frame::~Frame() |
| 55 { | 54 { |
| 56 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); | 55 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); |
| 57 ASSERT(!m_owner); | 56 ASSERT(!m_owner); |
| 58 } | 57 } |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 | 315 |
| 317 ASSERT(page()); | 316 ASSERT(page()); |
| 318 | 317 |
| 319 if (m_owner) | 318 if (m_owner) |
| 320 m_owner->setContentFrame(*this); | 319 m_owner->setContentFrame(*this); |
| 321 else | 320 else |
| 322 page()->setMainFrame(this); | 321 page()->setMainFrame(this); |
| 323 } | 322 } |
| 324 | 323 |
| 325 } // namespace blink | 324 } // namespace blink |
| OLD | NEW |