Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1330529 - Part 5: Remove some Windows line endings from PluginProcessChild.cpp. r=jimm

Browse Source 
MozReview-Commit-ID: DhNuxymQ97U

--HG--
extra : rebase_source : a44fbff88fa2512d59944b8ef9b27417199a8962
extra : histedit_source : 48145759bc8918864435730b102ab3ef7785eafc
This commit is contained in:
Chris Peterson 2018-02-02 22:45:12 -08:00
parent 6955347be6
commit d24d25c9c2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dom/plugins/ipc/PluginProcessChild.cpp
View File

@ -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