mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
5ec13acbdd
- Bug 1140264 part 1 - Avoid expanding auto-hidden ruby annotations. r=dbaron (5b6ddba10) - Bug 1140264 part 2 - Move and merge line breaking code in rbc reflow to reduce useless computation and fix undesired break point. r=dbaron (0d3aaad79) - Bug 1140264 part 3 - Rename IsInlineDescendantOfRuby to ShouldSuppressLineBreak and exclude rbc/rtc from it. r=dbaron (e929b296b) - Bug 1140264 part 4 - Reftest for this bug. r=dbaron (3aa19d44e) - Bug 1141842 - Add LastOptionalBreakPriority to nsLineLayout to simplify some code. r=roc (81cc1dcd0) - Bug 1137875 - Have the SharedFrameMetricsData hold a copy of the layers id. r=nical (81c657510) - Bug 1133237 - When transitioning from a shadow layer tree that has plugins to a tree that does not, make sure the old plugins get hidden properly. r=roc (11ff16c17) - Bug 1137875 - Have the LayerTransactionChild hold a copy of the layers id. r=nical (f9a090aad) - Bug 1137875 - Clear shared frame metrics objects associated with a PLayerTransaction when it is destroyed. r=nical (c5037ee27) - Bug 1119878 Part 1: Change SandboxTarget to hold sandbox target services to provide functions. r=aklotz, r=glandium, r=cpearce (7378d13e4) - Bug 1119878 Part 2: Change IPC code to hold ProcessID instead of ProcessHandle. r=billm, r=dvander, r=aklotz, r=cpearce (fa002f559) - Bug 1149971 Part 1: Follow-up to bug 1119878 to fix broken IPDL tests. r=dvander (76b843d43) and some lines of fix of toolkit/xre/nsEmbedFunctions.cpp after Bug 1119878 Part 2.
222 lines
6.5 KiB
C++
222 lines
6.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
* vim: sw=4 ts=4 et :
|
|
* 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 "nsXPCOM.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "nsAutoPtr.h"
|
|
|
|
// FIXME/cjones testing
|
|
#if !defined(OS_WIN)
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#ifdef XP_WIN
|
|
#include <windows.h>
|
|
// we want a wmain entry point
|
|
// but we don't want its DLL load protection, because we'll handle it here
|
|
#define XRE_DONT_PROTECT_DLL_LOAD
|
|
#include "nsWindowsWMain.cpp"
|
|
#include "nsSetDllDirectory.h"
|
|
#endif
|
|
|
|
#include "GMPLoader.h"
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
#include "mozilla/sandboxTarget.h"
|
|
#include "mozilla/sandboxing/loggingCallbacks.h"
|
|
#include "sandbox/win/src/sandbox_factory.h"
|
|
#endif
|
|
|
|
#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
|
|
#include "mozilla/Sandbox.h"
|
|
#include "mozilla/SandboxInfo.h"
|
|
#endif
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
# include <sys/time.h>
|
|
# include <sys/resource.h>
|
|
|
|
# include <binder/ProcessState.h>
|
|
|
|
# ifdef LOGE_IF
|
|
# undef LOGE_IF
|
|
# endif
|
|
|
|
# include <android/log.h>
|
|
# define LOGE_IF(cond, ...) \
|
|
( (CONDITION(cond)) \
|
|
? ((void)__android_log_print(ANDROID_LOG_ERROR, \
|
|
"Goanna:MozillaRntimeMain", __VA_ARGS__)) \
|
|
: (void)0 )
|
|
|
|
# ifdef MOZ_CONTENT_SANDBOX
|
|
# include "mozilla/Sandbox.h"
|
|
# endif
|
|
|
|
#endif // MOZ_WIDGET_GONK
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
#include <binder/ProcessState.h>
|
|
#include "ipc/Nuwa.h"
|
|
#endif
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
static void
|
|
InitializeBinder(void *aDummy) {
|
|
// Change thread priority to 0 only during calling ProcessState::self().
|
|
// The priority is registered to binder driver and used for default Binder
|
|
// Thread's priority.
|
|
// To change the process's priority to small value need's root permission.
|
|
int curPrio = getpriority(PRIO_PROCESS, 0);
|
|
int err = setpriority(PRIO_PROCESS, 0, 0);
|
|
MOZ_ASSERT(!err);
|
|
LOGE_IF(err, "setpriority failed. Current process needs root permission.");
|
|
android::ProcessState::self()->startThreadPool();
|
|
setpriority(PRIO_PROCESS, 0, curPrio);
|
|
}
|
|
#endif
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
static bool gIsSandboxEnabled = false;
|
|
|
|
class WinSandboxStarter : public mozilla::gmp::SandboxStarter {
|
|
public:
|
|
virtual void Start(const char *aLibPath) override {
|
|
if (gIsSandboxEnabled) {
|
|
sandbox::SandboxFactory::GetTargetServices()->LowerToken();
|
|
}
|
|
}
|
|
};
|
|
#endif
|
|
|
|
#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
|
|
class LinuxSandboxStarter : public mozilla::gmp::SandboxStarter {
|
|
LinuxSandboxStarter() { }
|
|
public:
|
|
static SandboxStarter* Make() {
|
|
if (mozilla::SandboxInfo::Get().CanSandboxMedia()) {
|
|
return new LinuxSandboxStarter();
|
|
} else {
|
|
// Sandboxing isn't possible, but the parent has already
|
|
// checked that this plugin doesn't require it. (Bug 1074561)
|
|
return nullptr;
|
|
}
|
|
}
|
|
virtual void Start(const char *aLibPath) override {
|
|
mozilla::SetMediaPluginSandbox(aLibPath);
|
|
}
|
|
};
|
|
#endif
|
|
|
|
mozilla::gmp::SandboxStarter*
|
|
MakeSandboxStarter()
|
|
{
|
|
// Note: MacOSX creates its SandboxStarter inside xul code; it
|
|
// needs to change to statically link its sandbox code into
|
|
// plugin-container. Once it does that, we can create the
|
|
// SandboxStarter for it here.
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
return new WinSandboxStarter();
|
|
#elif defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
|
|
return LinuxSandboxStarter::Make();
|
|
#else
|
|
return nullptr;
|
|
#endif
|
|
}
|
|
|
|
int
|
|
content_process_main(int argc, char* argv[])
|
|
{
|
|
// Check for the absolute minimum number of args we need to move
|
|
// forward here. We expect the last arg to be the child process type.
|
|
if (argc < 1) {
|
|
return 3;
|
|
}
|
|
XRE_SetProcessType(argv[--argc]);
|
|
|
|
bool isNuwa = false;
|
|
for (int i = 1; i < argc; i++) {
|
|
isNuwa |= strcmp(argv[i], "-nuwa") == 0;
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
gIsSandboxEnabled |= strcmp(argv[i], "-sandbox") == 0;
|
|
#endif
|
|
}
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
if (isNuwa) {
|
|
PrepareNuwaProcess();
|
|
}
|
|
#endif
|
|
|
|
#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
|
|
// This has to happen while we're still single-threaded, and on
|
|
// B2G that means before the Android Binder library is
|
|
// initialized. Additional special handling is needed for Nuwa:
|
|
// the Nuwa process itself needs to be unsandboxed, and the same
|
|
// single-threadedness condition applies to its children; see also
|
|
// AfterNuwaFork().
|
|
mozilla::SandboxEarlyInit(XRE_GetProcessType(), isNuwa);
|
|
#endif
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
// This creates a ThreadPool for binder ipc. A ThreadPool is necessary to
|
|
// receive binder calls, though not necessary to send binder calls.
|
|
// ProcessState::Self() also needs to be called once on the main thread to
|
|
// register the main thread with the binder driver.
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
if (!isNuwa) {
|
|
InitializeBinder(nullptr);
|
|
} else {
|
|
NuwaAddFinalConstructor(&InitializeBinder, nullptr);
|
|
}
|
|
#else
|
|
InitializeBinder(nullptr);
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef XP_WIN
|
|
// For plugins, this is done in PluginProcessChild::Init, as we need to
|
|
// avoid it for unsupported plugins. See PluginProcessChild::Init for
|
|
// the details.
|
|
if (XRE_GetProcessType() != GoannaProcessType_Plugin) {
|
|
mozilla::SanitizeEnvironmentVariables();
|
|
SetDllDirectory(L"");
|
|
}
|
|
|
|
#ifdef MOZ_SANDBOX
|
|
if (gIsSandboxEnabled) {
|
|
sandbox::TargetServices* target_service =
|
|
sandbox::SandboxFactory::GetTargetServices();
|
|
if (!target_service) {
|
|
return 1;
|
|
}
|
|
|
|
sandbox::ResultCode result =
|
|
mozilla::SandboxTarget::Instance()->InitTargetServices(target_service);
|
|
if (result != sandbox::SBOX_ALL_OK) {
|
|
return 2;
|
|
}
|
|
|
|
mozilla::sandboxing::PrepareForLogging();
|
|
}
|
|
#endif
|
|
#endif
|
|
nsAutoPtr<mozilla::gmp::GMPLoader> loader;
|
|
#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
|
|
// On desktop, the GMPLoader lives in plugin-container, so that its
|
|
// code can be covered by an EME/GMP vendor's voucher.
|
|
nsAutoPtr<mozilla::gmp::SandboxStarter> starter(MakeSandboxStarter());
|
|
if (XRE_GetProcessType() == GoannaProcessType_GMPlugin) {
|
|
loader = mozilla::gmp::CreateGMPLoader(starter);
|
|
}
|
|
#endif
|
|
nsresult rv = XRE_InitChildProcess(argc, argv, loader);
|
|
NS_ENSURE_SUCCESS(rv, 1);
|
|
|
|
return 0;
|
|
}
|