mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
bc8ce42355
- Bug 1226200: Don't assume a TCPSocket has only one managee (and rename LoneManagedOrNull) r=jdm (aa2d0fcc14) - Bug 1227300, Part 1 - Add an alert notification component. r=MattN,wchen (37758ce9ff) - Bug 1230700. Make Notification::ShowInternal explicitly suppress the exception from GetPermissionInternal. r=smaug (9e288cf5ae) - Bug 1225336 - Add telemetry about web notification display/messages. r=wchen,kitcambridge p=vladan# Please enter the commit message for your changes. Lines starting (b2e481691a) - Bug 1219030 - Collect notification management telemetry. r=wchen,MattN; p=ally (c0ba425b4e) - Bug 1212611 - Use system notification for website notifications in Android. r=mfinkle (84985bcf01) - Bug 1227300, Part 2 - Implement showAlert. r=MattN,wchen (33eedc7e91) - Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. (8bd73f43b0) - Bug 1137681 - Make user agent docshell overrides affect network requests. r=jduell (e8dabb8338) - Bug 1233245 - Propagate the interception information in the non-e10s case for all HTTP redirects, not just the internal ones; r=jdm (6922fddcf8) - Bug 1226444 - Use helper function to identify preloads. r=sicking (d110669f73) - Bug 1214305 - Part 1: Refactor the logic for querying whether a connection should go through a secure upgrade into NS_ShouldSecureUpgrade; r=mcmanus (2d04c78290) - Bug 1137681 - Per-tab user agent emulation. r=bz (4ff70db690) - Bug 1227300, Part 3 - Implement showAlert for the OS X alerts backend. r=mstange (5eb05d0728) - Bug 1227300, Part 4 - Implement showAlert for the libnotify alerts backend. r=karlt (0942fa2764) - Bug 1227300, Part 5 - Implement showAlert for the B2G alerts backend. r=mhenretty (e39581aea5) - Bug 1227300, Part 6 - Use showAlert to display web notifications. r=wchen (ab79eaa0c8) - domBug 1227300, Part 7 - Update test interfaces. a=testonly (387cb62772) - Bug 1214305 - Part 3: Add a nsIInterceptedChannel.secureUpgradedChannelURI helper; r=jdm (811d25bd58) - Bug 1214305 - Part 4: Use the secure upgraded channel URI in ServiceWorkerManager::PrepareFetchEvent; r=jdm (0c44bf527c) - Bug 1214305 - Part 5: Use the secure upgraded channel URI in FetchEventRunnable::Init; r=jdm (a30f239261) - Bug 1214305 - Part 6: Use a non-IPC redirect for synthesized upgraded responses to ensure the response URL is correctly propagated; r=mcmanus (8ba8a5728c) - Bug 1214305 - Part 7: Decide in the child process whether an intercepted channel should go through a secure upgrade; r=mcmanus (93e27decae) - Bug 1198397 - Add a test for interception of requests upgraded through the CSP upgrade-insecure-requests directive; r=jdm (21eb14eb34) - Bug 1214305 - Part 8: Enable secure upgrade service worker tests on e10s; r=jdm (c14f5fb504) - Bug 1214305 - Part 10: Clean up global DataStorage references in the child process; r=keeler (ef0b52d049) - Bug 1224771 - Close all web notifications when the originating tab is closed. r=wchen (da295b4ba7) - Bug 1214305 - Part 2: Refactor the logic for obtaining the secure upgraded URI into HttpBaseChannel; r=mcmanus (3346078285) - Bug 1237151 (part 1) - Remove ignored qualifiers in dom/media/gmp/. r=cpearce. (18134820a6) - Bug 1237151 (part 2) - Remove ignored qualifiers in WebRTC-relate code. r=jesup. (effe5bd694) - Bug 1118820 part 1 (style system part) - [css-grid] Implement the 'auto-fill' and 'auto-fit' keywords in the repeat() function. r=dholbert (5db1a577db) - Bug 1118820 part 2a - [css-grid] Add a LineNameMap class that lets us lookup line names with a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taken into account. r=dholbert (3ecf4b53f0) - Bug 1118820 part 2b - [css-grid] Move the static functions FindLine/RFindLine/FindNamedLine into the LineNameMap class (idempotent patch). r=dholbert (efb12c594b) - Bug 1118820 part 2c+2d - [css-grid] Modify the LineNameMap::FindLine/RFindLine/FindNamedLine methods to take line names associated with 'repeat(auto-fill/auto-fit)' tracks into account. Instantiate and pass around a LineNameMap object instead of an array of line name arrays. r=dholbert (a3db750297) - Bug 1118820 part 3a - [css-grid] Modify TrackSizingFunctions to take a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taking into account. r=dholbert (9aa6033332) - Bug 1118820 part 3b - [css-grid] Implement the CalculateRepeatFillCount method that calculates the number of 'repeat(auto-fill/auto-fit)' tracks to use for the given sizes. r=dholbert (cf75fab8a8) - Bug 1118820 part 4 - [css-grid] Provide the sizes to use for CalculateRepeatFillCount. r=dholbert (8184c00dba) - Bug 1118820 part 5 - [css-grid] Remove any empty 'repeat(auto-fit)' tracks at the end of its range and adjust affected grid area line numbers accordingly. r=dholbert (c02ba6a6e3) - Bug 1229165 - [css-grid] Reftests for min/max-width/height properties on the grid container. (725097f878) - Bug 1229999 - [css-grid] Reftest. (51b5bc9535) - Bug 1237151 (part 3) - Remove ignored qualifiers in all remaining code. r=froydnj. (69917ebbad) - more bits of Bug 1178892 - Split the profiler into Core & Gecko files (41bb127b9c) - Bug 1199841 - Restructure private browsing to remember status after OnStopRequest r=jdm (16c2c1044d) - Bug 1233845 - Report an interception error and cancel the HTTP channel when encountering a known topcrash situation. r=ehsan (5d08075110) - Bug 664163 - Fix Get(Local|Remote)(Address|Port) in HttpChannelChild. r=jduell (cbf70af4e8) - Bug 1229177 - Show the tracking protection shield for fetch and XHR requests. r=jduell (5833b3e872) - Bug 1220678 Don't crash when DivertToParent() is called on an intercepted channel. r=jdm (5d7ff6ecc8) - Bug 1220681 P1 Make HttpChannelChild::DivertToParent() work with synthetic responses. r=jdm (67715703ef) - Bug 1169819 Add browser chrome test to validate SW force refresh. r=ehsan (c0b6b3e874) - Bug 1220681 P2 Test synthetic responses that trigger downloads. r=ehsan (c701f3ddb1) - Bug 1220681 P3 Delay diversion on parent side until response head has been synthesized. r=jdm (7c697aacee) - Bug 1220681 P4 Automatically suspend the parent channel after synthesizing the response for diverison. r=jdm (27f31bcb35) - Bug 1220681 P5 Don't double suspend parent channel during synthesized divert to parent. r=jdm (62081d4b56) - Bug 1220681 P6 Use clients.claim() in browser_download.js to avoid worker unregister race. r=jdm (c8de291727) - Bug 1240161 - Remove "only-if-cached" from RequestCache; r=bkelly (283486f584) - Bug 1184550 - Add a mochitest for the Request constructor that tests that the body is set to used after being fetched and then fails on the second fetch with the same Request. r=bkelly (db4a967203) - Bug 1205495 - Correctly use the requests's body and redirect mode in reroute.js; r=nsm (a36a96624a) - Bug 1189656 - Fix fetch-request-fallback test paths. r=bkelly (366c884179) - Bug 1219085 - Import the fetch-request-redirect.https.html test from Blink; r=jdm (bf6b484d82) - Bug 1209081 - Part 1: Implement the "navigate" value for RequestMode; r=bkelly (a22f19d94b) - Bug 1209081 - Part 2: Upgrade the saved Requests in the DOM Cache to reflect the "navigate" RequestMode if they represent navigation content policy types; r=bkelly (60d1da23bb) - Bug 1219469 - Part 1: Revert the error reporting added in bug 1233845; r=jdm (dcc022b9d3) - Bug 1219469 - Part 2: Make HttpChannelParentListener be the controller; r=jdm,jduell (9c5f0dfbe0) - Bug 1229369 - Intercept redirected network fetches that have their request mode set to manual; r=jdm (fb21d86ed2)
292 lines
7.6 KiB
C++
292 lines
7.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "mozilla/Mutex.h"
|
|
#include "mozilla/Scoped.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "PoisonIOInterposer.h"
|
|
|
|
#ifdef MOZ_REPLACE_MALLOC
|
|
#include "replace_malloc_bridge.h"
|
|
#endif
|
|
|
|
// Auxiliary method to convert file descriptors to ids
|
|
#if defined(XP_WIN32)
|
|
#include <io.h>
|
|
inline intptr_t
|
|
FileDescriptorToHandle(int aFd)
|
|
{
|
|
return _get_osfhandle(aFd);
|
|
}
|
|
#else
|
|
inline intptr_t
|
|
FileDescriptorToHandle(int aFd)
|
|
{
|
|
return aFd;
|
|
}
|
|
#endif /* if not XP_WIN32 */
|
|
|
|
using namespace mozilla;
|
|
|
|
namespace {
|
|
struct DebugFilesAutoLockTraits
|
|
{
|
|
typedef PRLock* type;
|
|
typedef const PRLock* const_type;
|
|
static const_type empty() { return nullptr; }
|
|
static void release(type aL) { PR_Unlock(aL); }
|
|
};
|
|
|
|
class DebugFilesAutoLock : public Scoped<DebugFilesAutoLockTraits>
|
|
{
|
|
static PRLock* Lock;
|
|
public:
|
|
static void Clear();
|
|
static PRLock* getDebugFileIDsLock()
|
|
{
|
|
// On windows this static is not thread safe, but we know that the first
|
|
// call is from
|
|
// * An early registration of a debug FD or
|
|
// * The call to InitWritePoisoning.
|
|
// Since the early debug FDs are logs created early in the main thread
|
|
// and no writes are trapped before InitWritePoisoning, we are safe.
|
|
if (!Lock) {
|
|
Lock = PR_NewLock();
|
|
}
|
|
|
|
// We have to use something lower level than a mutex. If we don't, we
|
|
// can get recursive in here when called from logging a call to free.
|
|
return Lock;
|
|
}
|
|
|
|
DebugFilesAutoLock()
|
|
: Scoped<DebugFilesAutoLockTraits>(getDebugFileIDsLock())
|
|
{
|
|
PR_Lock(get());
|
|
}
|
|
};
|
|
|
|
PRLock* DebugFilesAutoLock::Lock;
|
|
void
|
|
DebugFilesAutoLock::Clear()
|
|
{
|
|
MOZ_ASSERT(Lock != nullptr);
|
|
Lock = nullptr;
|
|
}
|
|
|
|
// The ChunkedList<T> class implements, at the high level, a non-iterable
|
|
// list of instances of T. Its goal is to be somehow minimalist for the
|
|
// use case of storing the debug files handles here, with the property of
|
|
// not requiring a lock to look up whether it contains a specific value.
|
|
// It is also chunked in blocks of chunk_size bytes so that its
|
|
// initialization doesn't require a memory allocation, while keeping the
|
|
// possibility to increase its size as necessary. Note that chunks are
|
|
// never deallocated (except in the destructor).
|
|
// All operations are essentially O(N) but N is not expected to be large
|
|
// enough to matter.
|
|
template <typename T, size_t chunk_size=64>
|
|
class ChunkedList {
|
|
struct ListChunk {
|
|
static const size_t kLength = \
|
|
(chunk_size - sizeof(ListChunk*)) / sizeof(mozilla::Atomic<T>);
|
|
|
|
mozilla::Atomic<T> mElements[kLength];
|
|
mozilla::UniquePtr<ListChunk> mNext;
|
|
|
|
ListChunk() : mNext(nullptr) {}
|
|
};
|
|
|
|
ListChunk mList;
|
|
mozilla::Atomic<size_t> mLength;
|
|
|
|
public:
|
|
ChunkedList() : mLength(0) {}
|
|
|
|
~ChunkedList() {
|
|
// There can be writes happening after this destructor runs, so keep
|
|
// the list contents and don't reset mLength. But if there are more
|
|
// elements left than the first chunk can hold, then all hell breaks
|
|
// loose for any write that would happen after that because any extra
|
|
// chunk would be deallocated, so just crash in that case.
|
|
MOZ_RELEASE_ASSERT(mLength <= ListChunk::kLength);
|
|
}
|
|
|
|
// Add an element at the end of the last chunk of the list. Create a new
|
|
// chunk if there is not enough room.
|
|
// This is not thread-safe with another thread calling Add or Remove.
|
|
void Add(T aValue)
|
|
{
|
|
ListChunk *list = &mList;
|
|
size_t position = mLength;
|
|
for (; position >= ListChunk::kLength; position -= ListChunk::kLength) {
|
|
if (!list->mNext) {
|
|
list->mNext.reset(new ListChunk());
|
|
}
|
|
list = list->mNext.get();
|
|
}
|
|
// Use an order of operations that ensures any racing Contains call
|
|
// can't be hurt.
|
|
list->mElements[position] = aValue;
|
|
mLength++;
|
|
}
|
|
|
|
// Remove an element from the list by replacing it with the last element
|
|
// of the list, and then shrinking the list.
|
|
// This is not thread-safe with another thread calling Add or Remove.
|
|
void Remove(T aValue)
|
|
{
|
|
if (!mLength) {
|
|
return;
|
|
}
|
|
ListChunk *list = &mList;
|
|
size_t last = mLength - 1;
|
|
do {
|
|
size_t position = 0;
|
|
// Look for an element matching the given value.
|
|
for (; position < ListChunk::kLength; position++) {
|
|
if (aValue == list->mElements[position]) {
|
|
ListChunk *last_list = list;
|
|
// Look for the last element in the list, starting from where we are
|
|
// instead of starting over.
|
|
for (; last >= ListChunk::kLength; last -= ListChunk::kLength) {
|
|
last_list = last_list->mNext.get();
|
|
}
|
|
// Use an order of operations that ensures any racing Contains call
|
|
// can't be hurt.
|
|
T value = last_list->mElements[last];
|
|
list->mElements[position] = value;
|
|
mLength--;
|
|
return;
|
|
}
|
|
}
|
|
last -= ListChunk::kLength;
|
|
list = list->mNext.get();
|
|
} while (list);
|
|
}
|
|
|
|
// Returns whether the list contains the given value. It is meant to be safe
|
|
// to use without locking, with the tradeoff of being not entirely accurate
|
|
// if another thread adds or removes an element while this function runs.
|
|
bool Contains(T aValue)
|
|
{
|
|
ListChunk *list = &mList;
|
|
// Fix the range of the lookup to whatever the list length is when the
|
|
// function is called.
|
|
size_t length = mLength;
|
|
do {
|
|
size_t list_length = ListChunk::kLength;
|
|
list_length = std::min(list_length, length);
|
|
for (size_t position = 0; position < list_length; position++) {
|
|
if (aValue == list->mElements[position]) {
|
|
return true;
|
|
}
|
|
}
|
|
length -= ListChunk::kLength;
|
|
list = list->mNext.get();
|
|
} while (list);
|
|
|
|
return false;
|
|
}
|
|
};
|
|
|
|
typedef ChunkedList<intptr_t> FdList;
|
|
|
|
// Return a list used to hold the IDs of the current debug files. On unix
|
|
// an ID is a file descriptor. On Windows it is a file HANDLE.
|
|
FdList&
|
|
getDebugFileIDs()
|
|
{
|
|
static FdList DebugFileIDs;
|
|
return DebugFileIDs;
|
|
}
|
|
|
|
|
|
} // namespace
|
|
|
|
namespace mozilla {
|
|
|
|
// Auxiliary Method to test if a file descriptor is registered to be ignored
|
|
// by the poisoning IO interposer
|
|
bool
|
|
IsDebugFile(intptr_t aFileID)
|
|
{
|
|
return getDebugFileIDs().Contains(aFileID);
|
|
}
|
|
|
|
} // namespace mozilla
|
|
|
|
extern "C" {
|
|
|
|
void
|
|
MozillaRegisterDebugHandle(intptr_t aHandle)
|
|
{
|
|
DebugFilesAutoLock lockedScope;
|
|
FdList& DebugFileIDs = getDebugFileIDs();
|
|
MOZ_ASSERT(!DebugFileIDs.Contains(aHandle));
|
|
DebugFileIDs.Add(aHandle);
|
|
}
|
|
|
|
void
|
|
MozillaRegisterDebugFD(int aFd)
|
|
{
|
|
MozillaRegisterDebugHandle(FileDescriptorToHandle(aFd));
|
|
}
|
|
|
|
void
|
|
MozillaRegisterDebugFILE(FILE* aFile)
|
|
{
|
|
int fd = fileno(aFile);
|
|
if (fd == 1 || fd == 2) {
|
|
return;
|
|
}
|
|
MozillaRegisterDebugFD(fd);
|
|
}
|
|
|
|
void
|
|
MozillaUnRegisterDebugHandle(intptr_t aHandle)
|
|
{
|
|
DebugFilesAutoLock lockedScope;
|
|
FdList& DebugFileIDs = getDebugFileIDs();
|
|
MOZ_ASSERT(DebugFileIDs.Contains(aHandle));
|
|
DebugFileIDs.Remove(aHandle);
|
|
}
|
|
|
|
void
|
|
MozillaUnRegisterDebugFD(int aFd)
|
|
{
|
|
MozillaUnRegisterDebugHandle(FileDescriptorToHandle(aFd));
|
|
}
|
|
|
|
void
|
|
MozillaUnRegisterDebugFILE(FILE* aFile)
|
|
{
|
|
int fd = fileno(aFile);
|
|
if (fd == 1 || fd == 2) {
|
|
return;
|
|
}
|
|
fflush(aFile);
|
|
MozillaUnRegisterDebugFD(fd);
|
|
}
|
|
|
|
} // extern "C"
|
|
|
|
#ifdef MOZ_REPLACE_MALLOC
|
|
void
|
|
DebugFdRegistry::RegisterHandle(intptr_t aHandle)
|
|
{
|
|
MozillaRegisterDebugHandle(aHandle);
|
|
}
|
|
|
|
void
|
|
DebugFdRegistry::UnRegisterHandle(intptr_t aHandle)
|
|
{
|
|
MozillaUnRegisterDebugHandle(aHandle);
|
|
}
|
|
#endif
|