| 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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "core/layout/LayoutPart.h" | 42 #include "core/layout/LayoutPart.h" |
| 43 #include "core/layout/api/LayoutPartItem.h" | 43 #include "core/layout/api/LayoutPartItem.h" |
| 44 #include "core/loader/EmptyClients.h" | 44 #include "core/loader/EmptyClients.h" |
| 45 #include "core/loader/NavigationScheduler.h" | 45 #include "core/loader/NavigationScheduler.h" |
| 46 #include "core/page/FocusController.h" | 46 #include "core/page/FocusController.h" |
| 47 #include "core/page/Page.h" | 47 #include "core/page/Page.h" |
| 48 #include "platform/Histogram.h" | 48 #include "platform/Histogram.h" |
| 49 #include "platform/InstanceCounters.h" | 49 #include "platform/InstanceCounters.h" |
| 50 #include "platform/UserGestureIndicator.h" | 50 #include "platform/UserGestureIndicator.h" |
| 51 #include "platform/feature_policy/FeaturePolicy.h" | 51 #include "platform/feature_policy/FeaturePolicy.h" |
| 52 #include "platform/network/ResourceError.h" | 52 #include "platform/loader/fetch/ResourceError.h" |
| 53 | 53 |
| 54 namespace blink { | 54 namespace blink { |
| 55 | 55 |
| 56 using namespace HTMLNames; | 56 using namespace HTMLNames; |
| 57 | 57 |
| 58 Frame::~Frame() { | 58 Frame::~Frame() { |
| 59 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); | 59 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); |
| 60 ASSERT(!m_owner); | 60 ASSERT(!m_owner); |
| 61 } | 61 } |
| 62 | 62 |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 | 422 |
| 423 ASSERT(page()); | 423 ASSERT(page()); |
| 424 | 424 |
| 425 if (m_owner) | 425 if (m_owner) |
| 426 m_owner->setContentFrame(*this); | 426 m_owner->setContentFrame(*this); |
| 427 else | 427 else |
| 428 page()->setMainFrame(this); | 428 page()->setMainFrame(this); |
| 429 } | 429 } |
| 430 | 430 |
| 431 } // namespace blink | 431 } // namespace blink |
| OLD | NEW |