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/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/UserGestureIndicator.h" | 51 #include "platform/UserGestureIndicator.h" |
52 #include "platform/feature_policy/FeaturePolicy.h" | |
52 | 53 |
53 namespace blink { | 54 namespace blink { |
54 | 55 |
55 using namespace HTMLNames; | 56 using namespace HTMLNames; |
56 | 57 |
57 Frame::~Frame() { | 58 Frame::~Frame() { |
58 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); | 59 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); |
59 ASSERT(!m_owner); | 60 ASSERT(!m_owner); |
60 } | 61 } |
61 | 62 |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
318 childFrames.append(child); | 319 childFrames.append(child); |
319 for (size_t i = 0; i < childFrames.size(); ++i) | 320 for (size_t i = 0; i < childFrames.size(); ++i) |
320 childFrames[i]->didChangeVisibilityState(); | 321 childFrames[i]->didChangeVisibilityState(); |
321 } | 322 } |
322 | 323 |
323 Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner) | 324 Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner) |
324 : m_treeNode(this), | 325 : m_treeNode(this), |
325 m_host(host), | 326 m_host(host), |
326 m_owner(owner), | 327 m_owner(owner), |
327 m_client(client), | 328 m_client(client), |
328 m_isLoading(false) { | 329 m_isLoading(false), |
330 m_featurePolicy(nullptr) { | |
dcheng
2016/11/03 05:54:43
Nit: this can just be default initialized.
iclelland
2016/11/03 14:59:20
Done.
| |
329 InstanceCounters::incrementCounter(InstanceCounters::FrameCounter); | 331 InstanceCounters::incrementCounter(InstanceCounters::FrameCounter); |
330 | 332 |
331 ASSERT(page()); | 333 ASSERT(page()); |
332 | 334 |
333 if (m_owner) | 335 if (m_owner) |
334 m_owner->setContentFrame(*this); | 336 m_owner->setContentFrame(*this); |
335 else | 337 else |
336 page()->setMainFrame(this); | 338 page()->setMainFrame(this); |
337 } | 339 } |
338 | 340 |
339 } // namespace blink | 341 } // namespace blink |
OLD | NEW |