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 30 matching lines...) Expand all Loading... |
41 #include "core/inspector/InspectorInstrumentation.h" | 41 #include "core/inspector/InspectorInstrumentation.h" |
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/FrameLoaderClient.h" | 45 #include "core/loader/FrameLoaderClient.h" |
46 #include "core/loader/NavigationScheduler.h" | 46 #include "core/loader/NavigationScheduler.h" |
47 #include "core/page/FocusController.h" | 47 #include "core/page/FocusController.h" |
48 #include "core/page/Page.h" | 48 #include "core/page/Page.h" |
49 #include "platform/Histogram.h" | 49 #include "platform/Histogram.h" |
50 #include "platform/InstanceCounters.h" | 50 #include "platform/InstanceCounters.h" |
| 51 #include "platform/feature_policy/FeaturePolicy.h" |
51 | 52 |
52 namespace blink { | 53 namespace blink { |
53 | 54 |
54 using namespace HTMLNames; | 55 using namespace HTMLNames; |
55 | 56 |
56 Frame::~Frame() { | 57 Frame::~Frame() { |
57 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); | 58 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); |
58 ASSERT(!m_owner); | 59 ASSERT(!m_owner); |
59 } | 60 } |
60 | 61 |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 | 333 |
333 ASSERT(page()); | 334 ASSERT(page()); |
334 | 335 |
335 if (m_owner) | 336 if (m_owner) |
336 m_owner->setContentFrame(*this); | 337 m_owner->setContentFrame(*this); |
337 else | 338 else |
338 page()->setMainFrame(this); | 339 page()->setMainFrame(this); |
339 } | 340 } |
340 | 341 |
341 } // namespace blink | 342 } // namespace blink |
OLD | NEW |