Bug 1412081 - Call KillClearOnShutdown(ShutdownPhase::ShutdownFinal) in PluginProcessChild on all platforms r=jimm
authorValentin Gosu <valentin.gosu@gmail.com>
Thu, 05 Jul 2018 17:20:58 +0200
changeset 426729 26163df1083ea2847022e60518ab973360b9d7c1
parent 426728 9ec0f327c5efc38970c090015eaf11a7e5c450b7
child 426730 365a0841117ae364c69dc777deddce8b0aaf3999
push id105302
push uservalentin.gosu@gmail.com
push dateMon, 16 Jul 2018 15:28:13 +0000
treeherdermozilla-inbound@26163df1083e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1412081
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1412081 - Call KillClearOnShutdown(ShutdownPhase::ShutdownFinal) in PluginProcessChild on all platforms r=jimm This call gated by ifdef OS_WIN - so on Linux it would leak objects that were supposed to be ClearOnShutdown in the plugin process
dom/plugins/ipc/PluginProcessChild.cpp
--- a/dom/plugins/ipc/PluginProcessChild.cpp
+++ b/dom/plugins/ipc/PluginProcessChild.cpp
@@ -162,15 +162,16 @@ PluginProcessChild::CleanUp()
 #if defined(OS_WIN)
     MOZ_ASSERT(NS_IsMainThread());
 
     // Shutdown components we started in Init.  Note that KillClearOnShutdown
     // is an event that is regularly part of XPCOM shutdown.  We do not
     // call XPCOM's shutdown but we need this event to be sent to avoid
     // leaking objects labeled as ClearOnShutdown.
     nsThreadManager::get().Shutdown();
-    mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
     NS_LogTerm();
 #endif
+
+    mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
 }
 
 } // namespace plugins
 } // namespace mozilla