mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
roytam1
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.
123 lines
3.0 KiB
C++
123 lines
3.0 KiB
C++
/* 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 "FileDescriptor.h"
|
|
|
|
#include "mozilla/Assertions.h"
|
|
#include "nsDebug.h"
|
|
|
|
#ifdef XP_WIN
|
|
|
|
#include <windows.h>
|
|
#include "ProtocolUtils.h"
|
|
#define INVALID_HANDLE INVALID_HANDLE_VALUE
|
|
|
|
#else // XP_WIN
|
|
|
|
#include <unistd.h>
|
|
|
|
#ifndef OS_POSIX
|
|
#define OS_POSIX
|
|
#endif
|
|
|
|
#include "base/eintr_wrapper.h"
|
|
#define INVALID_HANDLE -1
|
|
|
|
#endif // XP_WIN
|
|
|
|
using mozilla::ipc::FileDescriptor;
|
|
|
|
FileDescriptor::FileDescriptor()
|
|
: mHandle(INVALID_HANDLE), mHandleCreatedByOtherProcess(false),
|
|
mHandleCreatedByOtherProcessWasUsed(false)
|
|
{ }
|
|
|
|
FileDescriptor::FileDescriptor(PlatformHandleType aHandle)
|
|
: mHandle(INVALID_HANDLE), mHandleCreatedByOtherProcess(false),
|
|
mHandleCreatedByOtherProcessWasUsed(false)
|
|
{
|
|
DuplicateInCurrentProcess(aHandle);
|
|
}
|
|
|
|
void
|
|
FileDescriptor::DuplicateInCurrentProcess(PlatformHandleType aHandle)
|
|
{
|
|
MOZ_ASSERT_IF(mHandleCreatedByOtherProcess && IsValid(),
|
|
mHandleCreatedByOtherProcessWasUsed);
|
|
|
|
if (IsValid(aHandle)) {
|
|
PlatformHandleType newHandle;
|
|
#ifdef XP_WIN
|
|
if (::DuplicateHandle(GetCurrentProcess(), aHandle, GetCurrentProcess(),
|
|
&newHandle, 0, FALSE, DUPLICATE_SAME_ACCESS)) {
|
|
#else // XP_WIN
|
|
if ((newHandle = dup(aHandle)) != INVALID_HANDLE) {
|
|
#endif
|
|
mHandle = newHandle;
|
|
return;
|
|
}
|
|
NS_WARNING("Failed to duplicate file handle for current process!");
|
|
}
|
|
|
|
mHandle = INVALID_HANDLE;
|
|
}
|
|
|
|
void
|
|
FileDescriptor::CloseCurrentProcessHandle()
|
|
{
|
|
MOZ_ASSERT_IF(mHandleCreatedByOtherProcess && IsValid(),
|
|
mHandleCreatedByOtherProcessWasUsed);
|
|
|
|
// Don't actually close handles created by another process.
|
|
if (mHandleCreatedByOtherProcess) {
|
|
return;
|
|
}
|
|
|
|
if (IsValid()) {
|
|
#ifdef XP_WIN
|
|
if (!CloseHandle(mHandle)) {
|
|
NS_WARNING("Failed to close file handle for current process!");
|
|
}
|
|
#else // XP_WIN
|
|
HANDLE_EINTR(close(mHandle));
|
|
#endif
|
|
mHandle = INVALID_HANDLE;
|
|
}
|
|
}
|
|
|
|
FileDescriptor::PickleType
|
|
FileDescriptor::ShareTo(const FileDescriptor::IPDLPrivate&,
|
|
FileDescriptor::ProcessId aTargetPid) const
|
|
{
|
|
PlatformHandleType newHandle;
|
|
#ifdef XP_WIN
|
|
if (IsValid()) {
|
|
if (mozilla::ipc::DuplicateHandle(mHandle, aTargetPid, &newHandle, 0,
|
|
DUPLICATE_SAME_ACCESS)) {
|
|
return newHandle;
|
|
}
|
|
NS_WARNING("Failed to duplicate file handle for other process!");
|
|
}
|
|
return INVALID_HANDLE;
|
|
#else // XP_WIN
|
|
if (IsValid()) {
|
|
newHandle = dup(mHandle);
|
|
if (IsValid(newHandle)) {
|
|
return base::FileDescriptor(newHandle, /* auto_close */ true);
|
|
}
|
|
NS_WARNING("Failed to duplicate file handle for other process!");
|
|
}
|
|
return base::FileDescriptor();
|
|
#endif
|
|
|
|
MOZ_CRASH("Must not get here!");
|
|
}
|
|
|
|
// static
|
|
bool
|
|
FileDescriptor::IsValid(PlatformHandleType aHandle)
|
|
{
|
|
return aHandle != INVALID_HANDLE;
|
|
}
|