mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
b0cbe263c6
- Bug 1238964 Part 1: Hold new printable page sizes in print nsIPrintSettingsWin. r=jimm (b5e4d012ba) - Bug 1238964 Part 2: Move separate DEVMODE to nsIPrintSettings copying into nsPrintSettingsWin. r=jimm (cb7bb66037) - Bug 1218029 - Adds SRICheckDataVerifier for progressing data handling. r=francois (8331afc1a7) - Bug 1218029 - Implements progressive Unicode chars decoding in nsScriptLoader. r=djvj (2c32ca259a) - Bug 1237201 part 1 - Use MOZ_ALWAYS_TRUE in nsScriptLoadHandler::TryDecodeRawData. r=yury (8f7496be23) - Bug 1237201 part 2 - Handle Vector OOM in gfx/. r=jrmuizel,kats (d5e8bd3383) - Bug 1237201 part 3 - Handle Vector OOM in StreamingLexer. r=njn (be383e35b4) - Bug 1237201 part 4 - Handle Vector OOM in ipc/. r=billm (fe9a3bf25a) - Bug 1237201 part 5 - Ignore Vector OOM in JSMainRuntimeCompartmentsReporter. r=njn (d0070c0636) - Bug 1237201 part 6 - Handle Vector OOM in media/webrtc/. r=jesup (eab4e00735) - Bug 1186491 - Splitting nsIPerformanceStats in two;r=froydnj (006b578345) - Bug 1186491 - An API for watching slow performance alerts (xpcom-level);r=froydnj (4fcefd66f5) - Bug 1237201 part 7 - Handle Vector OOM in nsPerformanceStats, telemetry. r=Yoric (6021b583ff) - Bug 1237201 part 8 - Make fallible Vector methods MOZ_WARN_UNUSED_RESULT. r=jwalden (90144c2d35) - Bug 1237201 part 9 - Fix remaining issues. r=nfroyd (25b86adb6d) - Bug 1186491 - An API for watching slow performance alerts (js-level); r=felipe (f04d277c80) - Bug 1200172 - AddonWatcher now discards data if the system is apparently too busy/just back from hibernation. r=mossop (66a3840b73) - Bug 1205840 - Typo fixes in AddonWatcher.jsm. r=felipe (760df6764c) - Bug 1186491 - Reworking AddonWatcher to use low-level performance watch API;r=mossop (81cc64263e) - Bug 1200169 - Making the slow add-on watcher more tolerant;r=Felipe (fcf988d985) - Bug 1157009 - Redesign about:performance. r=felipe (cacc590716) - Bug 1189513 - Get rid of separation between e10s and non-e10s probes; r=felipe (7a6d996c93) - Bug 1191327 - Recapitulates alerts in about:performance now. r=felipe (53ecc02da9) - Bug 1189799 - Make sure that about:performance displays each add-on only once (front-end);r=felipe (1ee53a0410) - Bug 1208747 - Move most of Stopwatch-related code to XPCOM-land (JS-level);r=felipe (84af14c20e) - Bug 1229519: Fix miscellaneous parts of toolkit to pass eslint checks. r=MattN (00ce3585c5) - Bug 1230735 - AddonWatcher.alerts is now a map;r=Felipe (81bbafbbd4) - Bug 1241838 - Removing erroneous CPOW suffix, reworking buggy jank suffix;r=Felipe (020d6928e6) - Bug 1175098 - Fix double-loading of PerformanceStats content script. r=mconley (fb1c499343) - Bug 1189799 - Make sure that about:performance displays each add-on only once (back-end);r=felipe (1eac8258df) - Bug 1221761 - Probe.prototype.release() now swallows NS_ERROR_NOT_AVAILABLE. r=felipe (ba1d0032a9) - Bug 1142937 - AddonWatcher now communicates through nsIObserverService. r=felipe (ea2e7ccdaa) - Bug 967873 - Test changes for async removeTab (r=Gijs) (dae5cbf835) - more missing parts of Bug 1132072 - Tab switch refactoring (r=mconley) (dc5e310537) - Bug 1191460 Rebased patch and added userContextId to origin attributes. (r=tanvi,r=sicking) (723999e7fa) - Bug 1239040 - Cleanup of DrawTargetSkia GetBitmapForSurface to use installPixels. r=jrmuizel (4016f4d734) - Bug 1239040 - Cleanup of DrawTargetSkia Mask and MaskSurface. r=jrmuizel (908a44d47e) - Bug 1239040 - Implement PushLayer for DrawTargetSkia. r=Bas (ae74697559) - Bug 1246756 - part 1 - fix moz2d Skia usage for Skia m49 update. r=jrmuizel (5e4b0f41e3) - Bug 1239040 - Allow usage of SkCanvas::getTopDevice in Skia. r=jrmuizel (19bdd2cecb) - Bug 1239040 - Fix DrawTargetCairo/DrawTargetSkia LockBits and BorrowedXlibDrawable to work inside PushLayer. r=jrmuizel (b9ba04009b) - Bug 1239040 - Cleanup of DrawTargetSkia CopySurface to avoid accessing bottom layer directly. r=jrmuizel (6690702507) - Bug 1240437: Implement PushLayer and PopLayer for DrawTargetRecording. r=bas (22673a1b52) - Bug 1220629 - Part 1: Add PushLayer/PopLayer API to DrawTarget baseclass. r=jrmuizel (c4b4315749) - Bug 1220629 - Part 2: Prepare DrawTargetD2D1 for the possibilities of layers existing inside it. r=jrmuizel (f2a74151a8) - Bug 1220629 - Part 3: Implement PushLayer/PopLayer API in cairo. r=jrmuizel (9a52965141) - Bug 1220629 - Part 4: Allow gfxContext to use the native pushlayer implementations based on a pref. r=jrmuizel (f13b773ff3) - Bug 1220629 - Part 5: Implement PushLayer/PopLayer API for Direct2D 1.1. r=jrmuizel (8a040648a2) - Bug 1220629 - Part 6: Implement PushLayer/PopLayer API in several wrapper DT types. r=jrmuizel (cf76723216) - Bug 1220629 - Part 7: Mark several reftests fuzzy. r=jrmuizel (a6deab2300) - Bug 1220629 - Part 8: Enable native PushLayer/PopLayer by default on Windows and Linux. r=jrmuizel (eef18e1e3e) - Bug 1234494 - part 1 - don't build in Skia GPU code if support is disabled, r=jrmuizel (4c74813077) - Bug 1234494 - part 2 - disable Skia GPU support by default on certain *BSDs, r=glandium (6184133b33) - Bug 1246756 - part 2 - update Skia moz.build for m49 update. r=jrmuizel (e0cf4ab953) - Bug 1244454 - Fixed skia compilation on mingw. r=lsalzman (064a56e56e) - Bug 1242044 - "layout/reftests/css-gradients/linear-zero-length-1 fails under Skia content". r=jmuizelaar (bee8f76e72) - Bug 1242751 - fix assertion in SkLinearGradient. r=jmuizelaar (f5df5ed88f) - Bug 1238795 - Fix SkGpuDevice::drawBitmapRect to always update clips. r=jrmuizel (05a9a6b10a) - Bug 1230096 - fix GrAAConvexTessellator assertion. r=jrmuizel (18aef9bdcc) - Bug 1237983 - Investigate and remove the Bagheera Client Implementation. r=gfritzsche (6de39c0e32) - Bug 1246756 - part 3 - update Skia to m49 branch. r=jrmuizel (a02a53e368) - Bug 1234526 - Remove services/healthreport. r=gfritzsche (bb0c567255) - Bug 1234522 - Remove services/datareporting. r=gfritzsche (c7bfec7784) - Bug 1211166 - Use AppConstants in SessionRecorder.jsm r=ted (4434996c34) - Bug 1246756 - Cross compilation fixup. r=upstream (99e3e40ba1) - Bug 1248228 - Build fix for SkOSFile_stdio on OpenBSD. r=jmuizelaar (bbb1eb7ac0) - Bug 1250196 - Part 1: Import mozilla::Forward and mozilla::UniqePtr into the std namespace in a way that is compatible with libc++; r=lsalzman (ffeebcc133) - Bug 1248851 part 4 - Mark UniquePtr::release() MOZ_WARN_UNUSED_RESULT. r=Waldo (f43cced74c) - Bug 1250196 - Part 2: Rename UniquePtr::getDeleter() to get_deleter() in order to make it compatible with std::unique_ptr; r=froydnj (f8aeabfc9a) - Bug 1248851 part 3 - Fix a potential double-free issue in indexedDB. r=sicking (4d13f5047b) - Bug 1248851 part 2 - Remove redundant release() calls in indexedDB code. r=sicking (86d67ffad8) - Bug 1239702 - Fix SK_ARM_HAS_NEON build config r=lsalzman (4233a57122) - Bug 1245979 - make mfbt Function reference-counted so that it can be cheaply copied for compatibility with Skia. r=froydnj (bd69e9c07b) - Bug 1245055 - Remove gfx/skia/Makefile.in. r=mshal (bf2c611f38) - Bug 1232694 - fix typo in Compiler.h; r=botond (2b5abb9d2d) - Bug 1228641 - Rename begin/size to aBegin/aSize to avoid shadow warnings; r=botond (9222809505) - Bug 1248784 - Rename the existing AddRefTraits to ConstRemovingRefPtrTraits. r=froydnj (99d7b0ae1f) - Bug 1248784 - Extract the AddRef/Release calls into a non-inner helper trait. r=froydnj (37243b6235) - Bug 1248784 - Followup to add requested comment. r=froydnj DONTBUILD (0e870b586b) - Bug 1242794 - make SkGrPixelRef::deepCopy preserve alpha type. r=jmuizelaar (0fb454c326) - Bug 1201037 - (Linux) squash network-change events during 1000ms, r=mcmanus (087f57c44d) - Bug 1235509 - Link monitor should not fire link change events for the refresh of the ipv6 lifetime. r=bagder (c507a319c4) - Bug 1234548 - Don't send network change events if routes are changed. r=mcmanus, r=bagder (5cd0bc582e) - Bug 1234548 - Remove unused variables. r=bustage (42df135fbf) - Bug 1240515 - change allocator for addr and localaddr from malloc to new, since the smart pointer that is used uses delete operator. r=dragana (02f5d5433c) - Bug 1241901 part 1 - Remove nsAutoPtr uses in nsNotifyAddrListener on Linux. r=bagder (f8696ad190) - Bug 1241901 part 2 - Use intptr_t to pass bluetooth service class instead of a pointer to heap. r=shawnjohnjr (5c86a164fa) - Bug 1241901 part 3 - Add IsMemberPointer and IsScalar type traits. r=froydnj (80747268bd) - Bug 1243876 - fix ConvertibleTester to not cause incomplete type errors with UniquePtr and Skia. r=nfroyd (c5588dd270) - Bug 1234736 - IonMonkey: Recover Math.imul as an int32 operation. r=h4writer (459b92c618) - Bug 1228571 - Fix GenerateSeed to not leave seed uninitialized if reading from /dev/urandom fails. r=cpeterson (3be0a2816b) - Bug 1233302: Don't crash if we can't open /dev/urandom; just fall back to PRMJ_Now. (d83ae5540a) - Bug 1167248 - Call RtlGenRandom() instead of rand_s() to workaround crashes from injected third-party hooks. r=jandem (678e7a0056) - Bug 1236619 Fix compilation failure with warnings-as-errors with some compilers. r=njn (043956881d) - Bug 1167248 - Cross compilation fixup. (f4a34fb229)
301 lines
7.7 KiB
C++
301 lines
7.7 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set sw=2 ts=2 autoindent cindent expandtab: */
|
|
/* 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 "nsXULAppAPI.h"
|
|
#include "application.ini.h"
|
|
#include "nsXPCOMGlue.h"
|
|
#include "nsStringGlue.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIFile.h"
|
|
#include "BinaryPath.h"
|
|
#include "nsAutoPtr.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <dlfcn.h>
|
|
|
|
#include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL
|
|
|
|
#define ASSERT(x) if (!(x)) { MOZ_CRASH(); }
|
|
|
|
// Functions being loaded by XPCOMGlue
|
|
XRE_ProcLoaderServiceRunType XRE_ProcLoaderServiceRun;
|
|
XRE_ProcLoaderClientInitType XRE_ProcLoaderClientInit;
|
|
XRE_ProcLoaderPreloadType XRE_ProcLoaderPreload;
|
|
extern XRE_CreateAppDataType XRE_CreateAppData;
|
|
extern XRE_GetFileFromPathType XRE_GetFileFromPath;
|
|
|
|
static const nsDynamicFunctionLoad kXULFuncs[] = {
|
|
{ "XRE_ProcLoaderServiceRun", (NSFuncPtr*) &XRE_ProcLoaderServiceRun },
|
|
{ "XRE_ProcLoaderClientInit", (NSFuncPtr*) &XRE_ProcLoaderClientInit },
|
|
{ "XRE_ProcLoaderPreload", (NSFuncPtr*) &XRE_ProcLoaderPreload },
|
|
{ "XRE_CreateAppData", (NSFuncPtr*) &XRE_CreateAppData },
|
|
{ "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath },
|
|
{ nullptr, nullptr }
|
|
};
|
|
|
|
typedef mozilla::Vector<int> FdArray;
|
|
static const int kReservedFileDescriptors = 5;
|
|
static const int kBeginReserveFileDescriptor = STDERR_FILENO + 1;
|
|
|
|
static int
|
|
GetDirnameSlash(const char *aPath, char *aOutDir, int aMaxLen)
|
|
{
|
|
char *lastSlash = strrchr(aPath, XPCOM_FILE_PATH_SEPARATOR[0]);
|
|
if (lastSlash == nullptr) {
|
|
return 0;
|
|
}
|
|
int cpsz = lastSlash - aPath + 1; // include slash
|
|
if (aMaxLen <= cpsz) {
|
|
return 0;
|
|
}
|
|
strncpy(aOutDir, aPath, cpsz);
|
|
aOutDir[cpsz] = 0;
|
|
return cpsz;
|
|
}
|
|
|
|
static bool
|
|
GetXPCOMPath(const char *aProgram, char *aOutPath, int aMaxLen)
|
|
{
|
|
nsAutoArrayPtr<char> progBuf(new char[aMaxLen]);
|
|
nsresult rv = mozilla::BinaryPath::Get(aProgram, progBuf);
|
|
NS_ENSURE_SUCCESS(rv, false);
|
|
|
|
int len = GetDirnameSlash(progBuf, aOutPath, aMaxLen);
|
|
NS_ENSURE_TRUE(!!len, false);
|
|
|
|
NS_ENSURE_TRUE((len + sizeof(XPCOM_DLL)) < (unsigned)aMaxLen, false);
|
|
char *afterSlash = aOutPath + len;
|
|
strcpy(afterSlash, XPCOM_DLL);
|
|
return true;
|
|
}
|
|
|
|
static bool
|
|
LoadLibxul(const char *aXPCOMPath)
|
|
{
|
|
nsresult rv;
|
|
|
|
XPCOMGlueEnablePreload();
|
|
rv = XPCOMGlueStartup(aXPCOMPath);
|
|
NS_ENSURE_SUCCESS(rv, false);
|
|
|
|
rv = XPCOMGlueLoadXULFunctions(kXULFuncs);
|
|
NS_ENSURE_SUCCESS(rv, false);
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Return true if |arg| matches the given argument name.
|
|
*/
|
|
static bool
|
|
IsArg(const char* arg, const char* s)
|
|
{
|
|
if (*arg == '-') {
|
|
if (*++arg == '-') {
|
|
++arg;
|
|
}
|
|
return !strcasecmp(arg, s);
|
|
}
|
|
|
|
#if defined(XP_WIN)
|
|
if (*arg == '/') {
|
|
return !strcasecmp(++arg, s);
|
|
}
|
|
#endif
|
|
|
|
return false;
|
|
}
|
|
|
|
static already_AddRefed<nsIFile>
|
|
GetAppIni(int argc, const char *argv[])
|
|
{
|
|
nsCOMPtr<nsIFile> appini;
|
|
nsresult rv;
|
|
|
|
// Allow firefox.exe to launch XULRunner apps via -app <application.ini>
|
|
// Note that -app must be the *first* argument.
|
|
const char *appDataFile = getenv("XUL_APP_FILE");
|
|
if (appDataFile && *appDataFile) {
|
|
rv = XRE_GetFileFromPath(appDataFile, getter_AddRefs(appini));
|
|
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
} else if (argc > 1 && IsArg(argv[1], "app")) {
|
|
if (argc == 2) {
|
|
return nullptr;
|
|
}
|
|
|
|
rv = XRE_GetFileFromPath(argv[2], getter_AddRefs(appini));
|
|
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
|
|
char appEnv[MAXPATHLEN];
|
|
snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", argv[2]);
|
|
if (putenv(appEnv)) {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
return appini.forget();
|
|
}
|
|
|
|
static bool
|
|
LoadStaticData(int argc, const char *argv[])
|
|
{
|
|
char xpcomPath[MAXPATHLEN];
|
|
bool ok = GetXPCOMPath(argv[0], xpcomPath, MAXPATHLEN);
|
|
NS_ENSURE_TRUE(ok, false);
|
|
|
|
ok = LoadLibxul(xpcomPath);
|
|
NS_ENSURE_TRUE(ok, false);
|
|
|
|
char progDir[MAXPATHLEN];
|
|
ok = GetDirnameSlash(xpcomPath, progDir, MAXPATHLEN);
|
|
NS_ENSURE_TRUE(ok, false);
|
|
|
|
nsCOMPtr<nsIFile> appini = GetAppIni(argc, argv);
|
|
const nsXREAppData *appData;
|
|
if (appini) {
|
|
nsresult rv =
|
|
XRE_CreateAppData(appini, const_cast<nsXREAppData**>(&appData));
|
|
NS_ENSURE_SUCCESS(rv, false);
|
|
} else {
|
|
appData = &sAppData;
|
|
}
|
|
|
|
XRE_ProcLoaderPreload(progDir, appData);
|
|
|
|
if (appini) {
|
|
XRE_FreeAppData(const_cast<nsXREAppData*>(appData));
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Fork and run parent and child process.
|
|
*
|
|
* The parent is the b2g process and child for Nuwa.
|
|
*/
|
|
static int
|
|
RunProcesses(int argc, const char *argv[], FdArray& aReservedFds)
|
|
{
|
|
/*
|
|
* The original main() of the b2g process. It is renamed to
|
|
* b2g_main() for the b2g loader.
|
|
*/
|
|
int b2g_main(int argc, const char *argv[]);
|
|
|
|
int ipcSockets[2] = {-1, -1};
|
|
int r = socketpair(AF_LOCAL, SOCK_STREAM, 0, ipcSockets);
|
|
ASSERT(r == 0);
|
|
int parentSock = ipcSockets[0];
|
|
int childSock = ipcSockets[1];
|
|
|
|
r = fcntl(parentSock, F_SETFL, O_NONBLOCK);
|
|
ASSERT(r != -1);
|
|
r = fcntl(childSock, F_SETFL, O_NONBLOCK);
|
|
ASSERT(r != -1);
|
|
|
|
pid_t pid = fork();
|
|
ASSERT(pid >= 0);
|
|
bool isChildProcess = pid == 0;
|
|
|
|
close(isChildProcess ? parentSock : childSock);
|
|
|
|
if (isChildProcess) {
|
|
/* The Nuwa process */
|
|
/* This provides the IPC service of loading Nuwa at the process.
|
|
* The b2g process would send a IPC message of loading Nuwa
|
|
* as the replacement of forking and executing plugin-container.
|
|
*/
|
|
return XRE_ProcLoaderServiceRun(getppid(), childSock, argc, argv,
|
|
aReservedFds);
|
|
}
|
|
|
|
// Reap zombie child process.
|
|
struct sigaction sa;
|
|
sa.sa_handler = SIG_IGN;
|
|
sigemptyset(&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
sigaction(SIGCHLD, &sa, nullptr);
|
|
|
|
// The b2g process
|
|
int childPid = pid;
|
|
XRE_ProcLoaderClientInit(childPid, parentSock, aReservedFds);
|
|
return b2g_main(argc, argv);
|
|
}
|
|
|
|
/**
|
|
* Reserve the file descriptors that shouldn't be taken for other use for the
|
|
* child process.
|
|
*/
|
|
static void
|
|
ReserveFileDescriptors(FdArray& aReservedFds)
|
|
{
|
|
for (int i = 0; i < kReservedFileDescriptors; i++) {
|
|
struct stat fileState;
|
|
int target = kBeginReserveFileDescriptor + i;
|
|
if (fstat(target, &fileState) == 0) {
|
|
MOZ_CRASH("ProcLoader error: a magic file descriptor is occupied.");
|
|
}
|
|
|
|
int fd = open("/dev/null", O_RDWR);
|
|
if (fd == -1) {
|
|
MOZ_CRASH("ProcLoader error: failed to reserve a magic file descriptor.");
|
|
}
|
|
|
|
if (!aReservedFds.append(target)) {
|
|
MOZ_CRASH("Failed to append to aReservedFds");
|
|
}
|
|
|
|
if (fd == target) {
|
|
// No need to call dup2(). We already occupy the desired file descriptor.
|
|
continue;
|
|
}
|
|
|
|
if (dup2(fd, target)) {
|
|
MOZ_CRASH("ProcLoader error: failed to reserve a magic file descriptor.");
|
|
}
|
|
|
|
close(fd);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* B2G Loader is responsible for loading the b2g process and the
|
|
* Nuwa process. It forks into the parent process, for the b2g
|
|
* process, and the child process, for the Nuwa process.
|
|
*
|
|
* The loader loads libxul and performs initialization of static data
|
|
* before forking, so relocation of libxul and static data can be
|
|
* shared between the b2g process, the Nuwa process, and the content
|
|
* processes.
|
|
*/
|
|
int
|
|
main(int argc, const char* argv[])
|
|
{
|
|
/**
|
|
* Reserve file descriptors before loading static data.
|
|
*/
|
|
FdArray reservedFds;
|
|
ReserveFileDescriptors(reservedFds);
|
|
|
|
/*
|
|
* Before fork(), libxul and static data of Gecko are loaded for
|
|
* sharing.
|
|
*/
|
|
bool ok = LoadStaticData(argc, argv);
|
|
if (!ok) {
|
|
return 255;
|
|
}
|
|
|
|
return RunProcesses(argc, argv, reservedFds);
|
|
}
|