From d24d25c9c2d7ecd77244058454fe0f87722a2c1b Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Fri, 2 Feb 2018 22:45:12 -0800 Subject: [PATCH] Bug 1330529 - Part 5: Remove some Windows line endings from PluginProcessChild.cpp. r=jimm MozReview-Commit-ID: DhNuxymQ97U --HG-- extra : rebase_source : a44fbff88fa2512d59944b8ef9b27417199a8962 extra : histedit_source : 48145759bc8918864435730b102ab3ef7785eafc --- dom/plugins/ipc/PluginProcessChild.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp index 9b92ea291986..bef4f38774ac 100644 --- a/dom/plugins/ipc/PluginProcessChild.cpp +++ b/dom/plugins/ipc/PluginProcessChild.cpp @@ -37,7 +37,6 @@ using mozilla::ipc::IOThreadChild; namespace mozilla { namespace plugins { - bool PluginProcessChild::Init(int aArgc, char* aArgv[]) { @@ -113,11 +112,11 @@ PluginProcessChild::Init(int aArgc, char* aArgv[]) // We don't initialize XPCOM but we need the thread manager and the // logging framework for the FunctionBroker. - NS_SetMainThread(); - mozilla::TimeStamp::Startup(); - NS_LogInit(); + NS_SetMainThread(); + mozilla::TimeStamp::Startup(); + NS_LogInit(); mozilla::LogModule::Init(); - nsThreadManager::get().Init(); + nsThreadManager::get().Init(); #if defined(MOZ_SANDBOX) // This is probably the earliest we would want to start the sandbox. @@ -155,14 +154,14 @@ void 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); + 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