Index: Source/modules/netinfo/NavigatorNetworkInformation.cpp |
diff --git a/Source/modules/netinfo/NavigatorNetworkInformation.cpp b/Source/modules/netinfo/NavigatorNetworkInformation.cpp |
index 74065e8da859fc75e655513a45fd329f94e01b15..962fe6901193f7e67e1f69ef85eceb5223d2b15b 100644 |
--- a/Source/modules/netinfo/NavigatorNetworkInformation.cpp |
+++ b/Source/modules/netinfo/NavigatorNetworkInformation.cpp |
@@ -17,21 +17,23 @@ NavigatorNetworkInformation::NavigatorNetworkInformation(Navigator& navigator) |
{ |
} |
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorNetworkInformation); |
+NavigatorNetworkInformation::~NavigatorNetworkInformation() |
+{ |
+} |
NavigatorNetworkInformation& NavigatorNetworkInformation::from(Navigator& navigator) |
{ |
NavigatorNetworkInformation* supplement = toNavigatorNetworkInformation(navigator); |
if (!supplement) { |
supplement = new NavigatorNetworkInformation(navigator); |
- provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); |
+ provideTo(navigator, supplementName(), supplement); |
} |
return *supplement; |
} |
NavigatorNetworkInformation* NavigatorNetworkInformation::toNavigatorNetworkInformation(Navigator& navigator) |
{ |
- return static_cast<NavigatorNetworkInformation*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName())); |
+ return static_cast<NavigatorNetworkInformation*>(HeapSupplement<Navigator>::from(navigator, supplementName())); |
} |
const char* NavigatorNetworkInformation::supplementName() |
@@ -56,7 +58,7 @@ NetworkInformation* NavigatorNetworkInformation::connection() |
DEFINE_TRACE(NavigatorNetworkInformation) |
{ |
visitor->trace(m_connection); |
- WillBeHeapSupplement<Navigator>::trace(visitor); |
+ HeapSupplement<Navigator>::trace(visitor); |
DOMWindowProperty::trace(visitor); |
} |