mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
061201563e
- Bug 1274192 part 1 - make the MediaDecoderReaderWrapper as a proxy of WaitForData(); r=jwwang (9debdca9a9) - Bug 1274192 part 2 - make MDSM and SeekTask to adopt new MediaDecoderReaderWrapper API; r=jwwang (156f924dc9) - Bug 1276495: Don't reset audio promises for video only seek. r=jwwang,jya (c4632c7ff6) - Bug 1276318, part 1 - Fix leading tabs in ipc/glue. r=billm (46bcc4ccb3) - Bug 1035125 Part 1: Back out changeset 1910714b56c6 and associated subsequent changes. r=bsmedberg (3ead5efb66) - Bug 1035125 Part 2: Back out changeset 3c59642f6445 and associated subsequent changes. r=glandium (e86b4f4651) - Bug 1035125 Part 3: Back out changeset fa15c3e929d0 and associated subsequent changes. r=glandium (49585d6caf) - Bug 1188045 - Part 2: Delay-load xul.dll when built with clang-cl (90877526a3) - Bug 1188045 - Part 1: Move the definition of sandboxTarget::Instance() out-of-line; r=bobowen,glandium (5523a15f0e) - Bug 1035125 Part 4: Back out changeset 8ae39d920f5c and associated subsequent changes. r=glandium (4b952b6311) - Bug 1035125 Part 5: Back out changeset baa3f852133b and associated subsequent changes. r=glandium (0b08d2e71d) - Bug 1035125 Part 6: Take Chromium commit 3181ba39ee787e1b40f4aea4be23f4f666ad0945 to add Windows 10 version to enumeration. r=aklotz (af62c8065f) - Bug 1035125 Part 7: Remove unused functions in security/sandbox/chromium/base/time/time.h to avoid nspr dependency. r=aklotz (e10430c6ae) - Bug 1035125 Part 8: Pass sandboxing pointers through XRE_InitChildProcess instead of linking to more functions in xul. r=aklotz,glandium (07590ba9cd) - Bug 1035125 Part 9: Link Chromium sandbox into firefox.exe instead of having a separate DLL. r=aklotz,glandium (ae40d509d5) - Bug 1270752 - Fix lifetime of buffer passed to PR_SetEnv(). r=jduell (bfce06ebea) - Bug 1275117 - Fix static strings leaks when mozlogging is on. r=jduell (8e9066c5d7) - Bug 1114647 - Use firefox for child processes instead of plugin-container. r=ted (4e5871566d) - Bug 1271169 - Move all device binding code into librlz and remove static runtime requirement. r=glandium (fc9cfccbec) - Bug 1271169 - Move EME/GMP device binding code into GMPDeviceBinding.h/cpp. r=gerald (3fabde64b8) - Bug 1273048 - Add MOZ_GCC_VERSION_AT_MOST macro. r=froydnj (cfb5acdbe6) - Bug 1269968 - Remove unnecessary deduction on RefPtr.h. r=froydnj (30cf9bbf47) - Bug 525063 - add attribute to mark member variables that should be skipped by clang plugin initialization checker. r=nfroyd (78aa863f88) - Bug 1278391 - add move constructor to EnumeratedArray (r=njn) (5effe4e473) - Bug 1268518: Update basic-integer tests for rotations + clean up; r=sunfish (46827b6211) - Bug 1270370 - Part 1: Move SetIteratorObject to MapObject.h; r=jorendorff (01a27fbd50) - Bug 1270370 - Part 2: Expose MapIterator and SetIterator through ESClassValues; r=jorendorff (3edb3c7551) - Bug 1267551 (part 3) - Use MOZ_MUST_USE more in js/src/builtin/. r=jonco. (ea96d0fae0) - Bug 1267551 (part 4) - Use MOZ_MUST_USE more in js/src/asmjs/. r=bbouvier. (3e622c736d) - Bug 1268910: Refactor WebAssembly trap handling; r=luke (b59394a287) - Bug 1268910: Trap on edge cases for integer div/mod; r=sunfish (3d85230cc8) - Bug 1267551 (part 5) - Use MOZ_MUST_USE more in js/src/ctypes/. r=sfink. (e6580fb645) - Bug 1267551 (part 6) - Remove dead GenerateBlockId declaration. r=jorendorff. (74afcc549e) - Bug 1240072 - Add public JS APIs related to modules r=shu Bug 1267551 (part 7) - Use MOZ_MUST_USE more in js/src/frontend/. r=jorendorff. (5275c57768) - Bug 1267551 (part 8) - Use MOZ_MUST_USE more in js/src/gc/. r=terrence. (2572cc1c58) - Bug 1261063 - Part 1 - Remove public Telemetry functions that return raw histogram instances. r=chutten (3a68653c8f) - Bug 1261063 - Part 2 - Expose C++ function to clear Telemetry histograms. r=chutten (1f42f6aa1e) - Bug 1261063 - Part 3 - Make RasterImage use the public Telemetry API. r=tnikkel (0f564f3836) - Bug 1261063 - Part 4 - Use a count histogram for WebRTC call counts. r=jesup (b6b7b649e0) - Bug 1270073 - Point to Telemetry documentation in Telemetry.h. r=chutten (517279b284) - Bug 1261052 - Move C++ histogram implementation code into a separate module. r=gfritzsche. (66bcb1e167) - Bug 1145164 - Allow non-unitary increments to count histograms. r=gfritzsche (507e076e28) - Bug 1173447 - Add test for incremental pre-barriers when storing things under roots, r=jonco (caf8bd16be) - Bug 1267551 (part 10) - Use MOZ_MUST_USE in AutoVectorRooterBase. r=terrence. (2c5ed87a9f) - This catches a missing check. (b2fcd30fc5) - Bug 1267551 (part 11b) - Follow-up to fix Android bustage. r=me (f464ca7b98) - Bug 1271854 - Part 1: Allow specifying multiple GC zeal levels; r=terrence (da3c3e1281) - Bug 1271854 - Part 2: Allow specifying zeal modes by name as well; r=terrence (f63926e45b) - Bug 1271854 - Part 3: Avoid saving the GC zeal string inside the JS shell; r=terrence (f09b262e55) - Bug 1270062 - Unbust Windows full duplex. a=Tomcat (3c8b5887b6) - Bug 1270062 - Update libcubeb. rs=jesup (71805cb0e0) - Bug 1270004 - Update libcubeb. rs=jesup (2d90b9662f) - Bug 1280280 - Update cubeb to 073c9f011114. r=kinetik (6bee6a7f21) - Bug 1280280 - Update media/libcube/update.sh to add cubeb_jack.cpp, and sort the list of files. r=kinetik (430b7533c4) - Bug 1272604 - Add a zeal mode to check the heap after a moving GC r=terrence (85c018d71f) - Bug 1272604 - Fix bad implicit conversion constructor build error r=me (5c4e1dbc44) - Bug 1272604 - Fix hazard analysis failure r=me (0591aa2dca) - Bug 1232417 - Use a Variant to represent the CrossCompartmentWrapperMap key; r=jonco (19e759f1ba) - Bug 1269928 - Fold DirectProxyHandler into Wrapper, which is now its only (non-test) consumer. r=efaust (7550dde64d) - Bug 1273639 - Add a nonunified spidermonkey build, r=terrence (065364af2e) - Bug 1273639 - Fix nonunified spidermonkey builds, r=terrence (626042a5e0) - Bug 1273180 - Trigger major GC if necessary after minor GC r=terrence (cab82a4146) - Bug 1268992 - Assert that the heap is empty after a shutdown GC; r=jonco (35e37de1b2) - Bug 1273908 - Refactor GC to make it easier to add new kinds of GC thing r=terrence (edc8c4d66a)
234 lines
6.7 KiB
C++
234 lines
6.7 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"
|
|
|
|
#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"
|
|
#else
|
|
// FIXME/cjones testing
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "GMPLoader.h"
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
#include "mozilla/sandboxing/SandboxInitialization.h"
|
|
#include "mozilla/sandboxing/sandboxLogging.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, \
|
|
"Gecko: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 bool Start(const char *aLibPath) override {
|
|
if (gIsSandboxEnabled) {
|
|
mozilla::sandboxing::LowerSandbox();
|
|
}
|
|
return true;
|
|
}
|
|
};
|
|
#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 bool Start(const char *aLibPath) override {
|
|
mozilla::SetMediaPluginSandbox(aLibPath);
|
|
return true;
|
|
}
|
|
};
|
|
#endif
|
|
|
|
#if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
|
class MacSandboxStarter : public mozilla::gmp::SandboxStarter {
|
|
public:
|
|
virtual bool Start(const char *aLibPath) override {
|
|
std::string err;
|
|
bool rv = mozilla::StartMacSandbox(mInfo, err);
|
|
if (!rv) {
|
|
fprintf(stderr, "sandbox_init() failed! Error \"%s\"\n", err.c_str());
|
|
}
|
|
return rv;
|
|
}
|
|
virtual void SetSandboxInfo(MacSandboxInfo* aSandboxInfo) override {
|
|
mInfo = *aSandboxInfo;
|
|
}
|
|
private:
|
|
MacSandboxInfo mInfo;
|
|
};
|
|
#endif
|
|
|
|
mozilla::gmp::SandboxStarter*
|
|
MakeSandboxStarter()
|
|
{
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
return new WinSandboxStarter();
|
|
#elif defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
|
|
return LinuxSandboxStarter::Make();
|
|
#elif defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
|
|
return new MacSandboxStarter();
|
|
#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;
|
|
}
|
|
|
|
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
|
|
}
|
|
|
|
XREChildData childData;
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
if (gIsSandboxEnabled) {
|
|
childData.sandboxTargetServices =
|
|
mozilla::sandboxing::GetInitializedTargetServices();
|
|
if (!childData.sandboxTargetServices) {
|
|
return 1;
|
|
}
|
|
|
|
childData.ProvideLogFunction = mozilla::sandboxing::ProvideLogFunction;
|
|
}
|
|
#endif
|
|
|
|
XRE_SetProcessType(argv[--argc]);
|
|
|
|
#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() != GeckoProcessType_Plugin) {
|
|
mozilla::SanitizeEnvironmentVariables();
|
|
SetDllDirectoryW(L"");
|
|
}
|
|
#endif
|
|
#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK) && defined(MOZ_PLUGIN_CONTAINER)
|
|
// 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() == GeckoProcessType_GMPlugin) {
|
|
childData.gmpLoader = mozilla::gmp::CreateGMPLoader(starter);
|
|
}
|
|
#endif
|
|
nsresult rv = XRE_InitChildProcess(argc, argv, &childData);
|
|
NS_ENSURE_SUCCESS(rv, 1);
|
|
|
|
return 0;
|
|
}
|