| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/netinfo/NavigatorNetworkInformation.h" | 6 #include "modules/netinfo/NavigatorNetworkInformation.h" |
| 7 | 7 |
| 8 #include "core/frame/LocalDOMWindow.h" | 8 #include "core/frame/LocalDOMWindow.h" |
| 9 #include "core/frame/LocalFrame.h" | 9 #include "core/frame/LocalFrame.h" |
| 10 #include "core/frame/Navigator.h" | 10 #include "core/frame/Navigator.h" |
| 11 #include "modules/netinfo/NetworkInformation.h" | 11 #include "modules/netinfo/NetworkInformation.h" |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 NavigatorNetworkInformation::NavigatorNetworkInformation(Navigator& navigator) | 15 NavigatorNetworkInformation::NavigatorNetworkInformation(Navigator& navigator) |
| 16 : DOMWindowProperty(navigator.frame()) | 16 : DOMWindowProperty(navigator.frame()) |
| 17 { | 17 { |
| 18 } | 18 } |
| 19 | 19 |
| 20 NavigatorNetworkInformation::~NavigatorNetworkInformation() | 20 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorNetworkInformation); |
| 21 { | |
| 22 } | |
| 23 | 21 |
| 24 NavigatorNetworkInformation& NavigatorNetworkInformation::from(Navigator& naviga
tor) | 22 NavigatorNetworkInformation& NavigatorNetworkInformation::from(Navigator& naviga
tor) |
| 25 { | 23 { |
| 26 NavigatorNetworkInformation* supplement = toNavigatorNetworkInformation(navi
gator); | 24 NavigatorNetworkInformation* supplement = toNavigatorNetworkInformation(navi
gator); |
| 27 if (!supplement) { | 25 if (!supplement) { |
| 28 supplement = new NavigatorNetworkInformation(navigator); | 26 supplement = new NavigatorNetworkInformation(navigator); |
| 29 provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); | 27 provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); |
| 30 } | 28 } |
| 31 return *supplement; | 29 return *supplement; |
| 32 } | 30 } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 52 ASSERT(frame()->domWindow()); | 50 ASSERT(frame()->domWindow()); |
| 53 m_connection = NetworkInformation::create(frame()->domWindow()->executio
nContext()); | 51 m_connection = NetworkInformation::create(frame()->domWindow()->executio
nContext()); |
| 54 } | 52 } |
| 55 return m_connection.get(); | 53 return m_connection.get(); |
| 56 } | 54 } |
| 57 | 55 |
| 58 void NavigatorNetworkInformation::trace(Visitor* visitor) | 56 void NavigatorNetworkInformation::trace(Visitor* visitor) |
| 59 { | 57 { |
| 60 visitor->trace(m_connection); | 58 visitor->trace(m_connection); |
| 61 WillBeHeapSupplement<Navigator>::trace(visitor); | 59 WillBeHeapSupplement<Navigator>::trace(visitor); |
| 60 DOMWindowProperty::trace(visitor); |
| 62 } | 61 } |
| 63 | 62 |
| 64 } // namespace blink | 63 } // namespace blink |
| OLD | NEW |