| Index: Source/modules/plugins/NavigatorPlugins.cpp
|
| diff --git a/Source/modules/plugins/NavigatorPlugins.cpp b/Source/modules/plugins/NavigatorPlugins.cpp
|
| index 264bf7e4d67ec0b5eddfa827bab47df03f333682..bf48d9cfd8542de4495cae8a3512621bcd0949a7 100644
|
| --- a/Source/modules/plugins/NavigatorPlugins.cpp
|
| +++ b/Source/modules/plugins/NavigatorPlugins.cpp
|
| @@ -18,7 +18,9 @@ NavigatorPlugins::NavigatorPlugins(Navigator& navigator)
|
| {
|
| }
|
|
|
| -DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorPlugins);
|
| +NavigatorPlugins::~NavigatorPlugins()
|
| +{
|
| +}
|
|
|
| // static
|
| NavigatorPlugins& NavigatorPlugins::from(Navigator& navigator)
|
| @@ -26,7 +28,7 @@ NavigatorPlugins& NavigatorPlugins::from(Navigator& navigator)
|
| NavigatorPlugins* supplement = toNavigatorPlugins(navigator);
|
| if (!supplement) {
|
| supplement = new NavigatorPlugins(navigator);
|
| - provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
|
| + provideTo(navigator, supplementName(), supplement);
|
| }
|
| return *supplement;
|
| }
|
| @@ -34,7 +36,7 @@ NavigatorPlugins& NavigatorPlugins::from(Navigator& navigator)
|
| // static
|
| NavigatorPlugins* NavigatorPlugins::toNavigatorPlugins(Navigator& navigator)
|
| {
|
| - return static_cast<NavigatorPlugins*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
|
| + return static_cast<NavigatorPlugins*>(HeapSupplement<Navigator>::from(navigator, supplementName()));
|
| }
|
|
|
| // static
|
| @@ -87,7 +89,7 @@ DEFINE_TRACE(NavigatorPlugins)
|
| {
|
| visitor->trace(m_plugins);
|
| visitor->trace(m_mimeTypes);
|
| - WillBeHeapSupplement<Navigator>::trace(visitor);
|
| + HeapSupplement<Navigator>::trace(visitor);
|
| DOMWindowProperty::trace(visitor);
|
| }
|
|
|
|
|