Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1973)

Unified Diff: Source/modules/plugins/NavigatorPlugins.cpp

Issue 1101263003: Oilpan: have Navigator and its supplements be on the heap by default. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/plugins/NavigatorPlugins.h ('k') | Source/modules/presentation/NavigatorPresentation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « Source/modules/plugins/NavigatorPlugins.h ('k') | Source/modules/presentation/NavigatorPresentation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698