Skip to content

Commit

Permalink
Bug 1011225 - [e10s] Name mac content process. r=mstange
Browse files Browse the repository at this point in the history
--HG--
extra : rebase_source : 0b1e31e9fed6ec6227c101c3ccd6b5401822778c
  • Loading branch information
bgirard committed May 15, 2014
1 parent 9f5c951 commit c71d9a9
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
4 changes: 4 additions & 0 deletions dom/ipc/ContentChild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ ContentChild::InitProcessAttributes()
{
SendGetProcessAttributes(&mID, &mIsForApp, &mIsForBrowser);

#ifdef MOZ_WIDGET_GONK
#ifdef MOZ_NUWA_PROCESS
if (IsNuwaProcess()) {
SetProcessName(NS_LITERAL_STRING("(Nuwa)"), false);
Expand All @@ -567,6 +568,9 @@ ContentChild::InitProcessAttributes()
} else {
SetProcessName(NS_LITERAL_STRING("Browser"), false);
}
#else
SetProcessName(NS_LITERAL_STRING("Content Process"), true);
#endif

}

Expand Down
20 changes: 20 additions & 0 deletions ipc/glue/ProcessUtils_mac.mm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "ProcessUtils.h"

#include "nsString.h"

#include "mozilla/plugins/PluginUtilsOSX.h"

namespace mozilla {
namespace ipc {

void SetThisProcessName(const char *aName)
{
mozilla::plugins::PluginUtilsOSX::SetProcessName(aName);
}

} // namespace ipc
} // namespace mozilla
4 changes: 4 additions & 0 deletions ipc/glue/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
UNIFIED_SOURCES += [
'ProcessUtils_bsd.cpp'
]
elif CONFIG['OS_ARCH'] in ('Darwin'):
UNIFIED_SOURCES += [
'ProcessUtils_mac.mm'
]
else:
UNIFIED_SOURCES += [
'ProcessUtils_none.cpp',
Expand Down

0 comments on commit c71d9a9

Please sign in to comment.