roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 13:23:07 +00:00
Code Issues Projects Releases Wiki Activity

import changes from `dev' branch of rmottola/Arctic-Fox:

Browse Source 
- Bug 1131350 - Move update() to ServiceWorkerRegistration. r=baku (05a1a2455)
- Bug 1131327 - Patch 1 - Introduce ServiceWorkerRegistration{Base,MainThread,WorkerThread} r=baku (6d06516fb)
- Bug 1131327 - Patch 2 - Expose to workers. r=baku (bcc78d2dc)
- Bug 1131327 - Patch 3 - move event listeners to main thread class. r=baku (71d13a32e)
- Bug 1131327 - Patch 4 - Implement ServiceWorkerRegistration.update() on worker. r=baku (96fc35b67)
- Bug 1131327 - Patch 5 - Implement ServiceWorkerRegistration.unregister() on worker. r=baku (830bb8621)
- Bug 1131327 - Patch 6 - SWM holds ServiceWorkerRegistrationListener for updatefound and invalidation notifications. r=baku (52510f4f7)
- Bug 1131327 - Patch 7 - Fire updatefound on worker registration. r=baku (a3df7a2c5)
- Bug 1131327 - Patch 8 - Return null on worker attribute access. r=baku (e14624ed0)
- Bug 1131327 - Patch 9 - Fix windows compiler macro error. r=baku (9729d9603)
- Bug 1131327 - Patch 10 - Remember to remove the feature. r=baku (10842d560)
- Bug 1131327 followup: Add 'override' annotation to WorkerListener refcounting functions. rs=ehsan (0f623d0ce)
- Bug 1156397 - some fix for webpush PushServer. r=dougt r=nsm (351b7e56d)
- adjust to be able to apply patches (99479d8c1)
- Bug 1158218 Improve ServiceWorkerManager NS_WARNINGS on failure. r=nsm (7c51f3ad4)
- Bug 1038238 - Part 0: Make js/src/vm/SavedStacks.h use 1-based column numbers, (d0584178f)
- Bug 1145294. Remove the obj argument from JS::CloneAndExecuteScript. r=luke (a799d46f2)
- Bug 1038238 - Part 1: Make Error instances use SavedFrame objects for their stacks; r=jorendorff (bca4901a6)
- Bug 1038238 - Part 2: Add module level documentation for js/src/vm/SavedStacks.h; r=jorendorf (fa039731c)
- Bug 1038238 - Part 3: js::ComputeStackString should use SavedFrame; r=jorendorff (08b76514e)
- Bug 1140435 - Part 1 - Add the asyncCause and asyncCaller properties to nsIStackFrame. r=bz (e984c7c78)
- Bug 1140435 - Part 2 - Allow JS code to provide an async stack when calling a function. r=bz (8fca947d4)
- Bug 1147193. Go back to having our accessors on JSStackFrame infallible. r=bholley (ca4738861)
- Bug 1038238 - Part 4: Rename JS::StringifySavedFrameStack to JS::BuildStackString; r=jorendorff (30b7dd914)
- Bug 1148854 - Part 1: Relax the assertion in ServiceWorkerManager::DispatchFetchEvent; r=nsm,jdm (be0c8b711)
- Bug 1148854 - Part 2: Resume the intercepted network reuest if the interception fails for some reason; r=jdm (5242ce66a)
- Bug 1152473 - Remove InstallEvent. r=nsm,ehsan (774c4dfd8)
- Bug 1158218 Follow-up to fix mis-indentation. DONTBUILD, whitespace-only r=me (9164bd5d5)
- Bug 1157627 - about:serviceworkers should show new registered ServiceWorkers. r=nsm (e74322897)
- Bug 1134841 Hold ServiceWorker alive during install event's waitUntil(). r=bz (06587b935)
- Bug 1134325 - Part 1: Add an API for cloning a channel's upload stream; r=mcmanus (48c393420)
- Bug 1127552 - Add Telemetry to Fetch. r=nsm (2e091cc82)
- Bug 1134325 - Part 2: Correctly reflect the Request's body to the service worker's fetch event; r=jdm (359b2ba88)
- Bug 1154494 - Hit network only once. r=baku,bkelly (053dcaab9)
- part of Bug 1133805 - Enable all serviceworker tests (0f7113f81)
- Bug 1159378 - Part 1: Enable nsIStreamLoader to optionally notify an nsIRequestObserver; r=mcmanus (689925442)
- Bug 1159378 - Part 2: When storing the service worker downloaded after a failed network compare into the cache, store its security info in the cache as well; r=nsm (c09d17439)
- Bug 1152602 - dom/workers/test/serviceworkers/importscript.sjs should return an error at the second request, r=ehsan (1b0615460)
- Bug 1155989 - Dump the rejection of the promise returned by ServiceWorkerRegistration.unregister() in our tests; r=nsm (b6530f536)
- Bug 1159813 - Make sure service worker tests clean up after themselves; r=baku (584fadbd9)
- Bug 1140658 - Part 8: Disable the service worker part of these tests on b2g while bug 1137683 gets fixed; r=bkelly (8be7d310f)
- Bug 1141256 - Stop randomizing the URL for the service worker now that bug 931249 has been fixed (9b2ed03c4)
- Bug 1155988 - Use the ready promise more often in service worker tests; r=nsm (f7dc83d17)
- Bug 1159378 - Part 3: Refactor the logic of test_periodic_update.html into a helper script; r=nsm (daf047eda)
- Bug 1159378 - Part 4: Add a unit test for periodic updates of service workers on HTTPS origins; r=nsm (c3835fc1e)
- Bug 1080109 - Clear ServiceWorkers when clearing history or forgetting about site. r=baku,ehsan (207e84372)
- Bug 1155789 - Fail if sending a CPOW in parent when no CPOW manager exists (r=dvander) (6969640f0)
- Bug 1140284 - start the resolver even when offline; r=ehsan (673dab867)
- Bug 1149228, cache data: and https: handlers, r=honzab.moz (9735704f1)
- Bug 1140597 - Don't try and process device storage notifications if the process isn't using device storage. r=alchen (7112bbfd6)
- Bug 1035748 - WebIDL for DeviceStorageAreaChangedEvent. r=bz (7f59ebc63)
- Bug 1160190. Remove most of the pref annotations in test_interfaces and test_worker_interfaces. r=jst (e56728895)
- Bug 1126694 - IDL changes for DeviceStorageAreaListener. r=bz (47859f88a)
- Bug 1126694 - Impl of DeviceStorageAreaListener. r=bz, dhylands (f2ac42d54)
- Bug 1071562, check type now that CString is supported, r=smaug (284a5d81e)
- Bug 1160279: Recreate nsIFiles in the content process for dragged files. r=smaug (36fe16053)
- Bug 1134596 - SetOffline(false) in nsIOService::Init r=honzab (2660ea3d8)
- Bug 1134596 - Separate nsIOService's network detection from offlineMode r=honzab (8f5f02733)
- Bug 1134596 - Add network.offline-mirrors-connectivity pref to preserve previous behaviour r=honzab (ad4512be7)
- Bug 1179779 - Neither XRE_START_OFFLINE nor -offline work any more. r=mayhemer (218cbf4f4)
- Bug 1139628 - Test (r=billm) (787a5b937)
- Bug 1153023 - Extract an AddWindowListeners function. r=billm (380833b02)
- Bug 1153023 - Send the child process a dimensions update when the offset changes. r=roc (ad2306bd8)
- Bug 1153023 - Fix check to see if the TabParent::mRect needs updating. r=billm (aaa2ac2f1)
- Bug 1096093 - Send ThemeRefresh message from parent down to content process. r=smaug. (2049f1d97)
- Bug 1138793 - Add a sync IPC to get BrowserConfiguration. r=baku (41ec33eb6)
- Bug 803783 - Send message manager results via structured clone (r=bent) (0ea5d1ec6)
- Bug 1162838 - Allow sending initial process data to content processes (r=smaug) (a4bfdcc35)
- Bug 1143938 - Add listener argument to Components.utils.forceCC. r=smaug (f7ec5bd82)
- Bug 1137536, part 1 - Move DeferredFinalize out of the cyclecollector namespace. r=smaug (a3aab49c8)
- fix include order (196862592)
- Bug 1137536, part 2 - Make sure every file that uses an nsCycleCollector_ function includes nsCycleCollector.h. r=smaug (87e21ac93)
- Bug 1163387 - Rename FileImpl to BlobImpl, r=ehsan (8b3c092f1)
- Bug 1096494: Followup to use @binpath@ in package manifest for uninstall helper.exe. r=rstrong (8f240d126)
- Bug 1147839 - Fixed building installer on mingw. r=glandium (6b3081f87)
- Bug 1151005 - Refactor terminal notification stuff from 'mach build' into MozbuildObject r=gps (e556c0833)
- fix Install (f29193421)
- Bug 1151005 - Show notifications when the 'install' and 'package' mach commands complete r=gps (23b706bb6)
- mark done (91a6e3c2f)
- Bug 1154877 - Content process shouldn't use the Places Database. r=billm (aca46ccea)
- Bug 1170011 - Disable infinite recursion on the View Source command; r=jaws (9919916e9)
- Bug 1109875 - Fix test failures by making <xul:iframe> and <xul:editor> elements query the frameLoader for the docShell instead of the boxObject r=smaug (4a31ef82d)
- Bug 1109875 - Fix various other tests to properly wait for data from closed tabs r=billm (c7fbb0e08)
- Bug 1109875 - Add tests for async tab removal r=billm (0b02701ff)
This commit is contained in:
Roy Tam
2020-07-18 10:42:45 +08:00
parent be191f3772
commit 493f6ccfe1
271 changed files with 6041 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/base/nsFrameMessageManager.cpp
+135 -23
View File
@@ -62,6 +62,61 @@ using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::dom::ipc;
nsFrameMessageManager::nsFrameMessageManager(mozilla::dom::ipc::MessageManagerCallback* aCallback,
nsFrameMessageManager* aParentManager,
/* mozilla::dom::ipc::MessageManagerFlags */ uint32_t aFlags)
: mChrome(!!(aFlags & mozilla::dom::ipc::MM_CHROME)),
mGlobal(!!(aFlags & mozilla::dom::ipc::MM_GLOBAL)),
mIsProcessManager(!!(aFlags & mozilla::dom::ipc::MM_PROCESSMANAGER)),
mIsBroadcaster(!!(aFlags & mozilla::dom::ipc::MM_BROADCASTER)),
mOwnsCallback(!!(aFlags & mozilla::dom::ipc::MM_OWNSCALLBACK)),
mHandlingMessage(false),
mClosed(false),
mDisconnected(false),
mCallback(aCallback),
mParentManager(aParentManager)
{
NS_ASSERTION(mChrome || !aParentManager, "Should not set parent manager!");
NS_ASSERTION(!mIsBroadcaster || !mCallback,
"Broadcasters cannot have callbacks!");
if (mIsProcessManager && (!mChrome || IsBroadcaster())) {
mozilla::HoldJSObjects(this);
}
// This is a bit hackish. When parent manager is global, we want
// to attach the message manager to it immediately.
// Is it just the frame message manager which waits until the
// content process is running.
if (mParentManager && (mCallback || IsBroadcaster())) {
mParentManager->AddChildManager(this);
}
if (mOwnsCallback) {
mOwnedCallback = aCallback;
}
}
nsFrameMessageManager::~nsFrameMessageManager()
{
if (mIsProcessManager && (!mChrome || IsBroadcaster())) {
mozilla::DropJSObjects(this);
}
for (int32_t i = mChildManagers.Count(); i > 0; --i) {
static_cast<nsFrameMessageManager*>(mChildManagers[i - 1])->
Disconnect(false);
}
if (mIsProcessManager) {
if (this == sParentProcessManager) {
sParentProcessManager = nullptr;
}
if (this == sChildProcessManager) {
sChildProcessManager = nullptr;
delete mozilla::dom::SameProcessMessageQueue::Get();
}
if (this == sSameProcessParentManager) {
sSameProcessParentManager = nullptr;
}
}
}
static PLDHashOperator
CycleCollectorTraverseListeners(const nsAString& aKey,
nsAutoTObserverArray<nsMessageListenerInfo, 1>* aListeners,
@@ -83,8 +138,13 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFrameMessageManager)
tmp->mListeners.EnumerateRead(CycleCollectorTraverseListeners,
static_cast<void*>(&cb));
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChildManagers)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsFrameMessageManager)
NS_IMPL_CYCLE_COLLECTION_TRACE_JSVAL_MEMBER_CALLBACK(mInitialProcessData)
NS_IMPL_CYCLE_COLLECTION_TRACE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFrameMessageManager)
tmp->mListeners.Clear();
for (int32_t i = tmp->mChildManagers.Count(); i > 0; --i) {
@@ -92,6 +152,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFrameMessageManager)
Disconnect(false);
}
NS_IMPL_CYCLE_COLLECTION_UNLINK(mChildManagers)
tmp->mInitialProcessData.setNull();
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -129,6 +190,10 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFrameMessageManager)
NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIProcessScriptLoader,
mChrome && mIsProcessManager)
/* Global process message managers (process message managers) support nsIGlobalProcessScriptLoader. */
NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIGlobalProcessScriptLoader,
mChrome && mIsProcessManager && mIsBroadcaster)
/* Message senders in the chrome process support nsIProcessChecker. */
NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIProcessChecker,
mChrome && !mIsBroadcaster)
@@ -264,7 +329,7 @@ UnpackClonedMessageData(const ClonedMessageData& aData)
static_cast<typename BlobTraits<Flavor>::BlobType*>(blobs[i]);
MOZ_ASSERT(blob);
nsRefPtr<FileImpl> blobImpl = blob->GetBlobImpl();
nsRefPtr<BlobImpl> blobImpl = blob->GetBlobImpl();
MOZ_ASSERT(blobImpl);
// This object will be duplicated with a correct parent before being
@@ -675,7 +740,7 @@ nsFrameMessageManager::SendMessage(const nsAString& aMessageName,
objects = &aObjects.toObject();
}
InfallibleTArray<nsString> retval;
nsTArray<OwningSerializedStructuredCloneBuffer> retval;
sSendingSyncMessage |= aIsSync;
bool rv = mCallback->DoSendBlockingMessage(aCx, aMessageName, data, objects,
@@ -693,15 +758,13 @@ nsFrameMessageManager::SendMessage(const nsAString& aMessageName,
NS_ENSURE_TRUE(dataArray, NS_ERROR_OUT_OF_MEMORY);
for (uint32_t i = 0; i < len; ++i) {
if (retval[i].IsEmpty()) {
continue;
}
JS::Rooted<JS::Value> ret(aCx);
if (!JS_ParseJSON(aCx, static_cast<const char16_t*>(retval[i].get()),
retval[i].Length(), &ret)) {
if (!JS_ReadStructuredClone(aCx, retval[i].data, retval[i].dataLength,
JS_STRUCTURED_CLONE_VERSION, &ret, nullptr, nullptr)) {
MOZ_ASSERT(false, "Unable to read structured clone in SendMessage");
return NS_ERROR_UNEXPECTED;
}
NS_ENSURE_TRUE(JS_DefineElement(aCx, dataArray, i, ret, JSPROP_ENUMERATE),
NS_ERROR_OUT_OF_MEMORY);
}
@@ -989,10 +1052,10 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
const StructuredCloneData* aCloneData,
mozilla::jsipc::CpowHolder* aCpows,
nsIPrincipal* aPrincipal,
InfallibleTArray<nsString>* aJSONRetVal)
nsTArray<OwningSerializedStructuredCloneBuffer>* aRetVal)
{
return ReceiveMessage(aTarget, aTargetFrameLoader, mClosed, aMessage, aIsSync,
aCloneData, aCpows, aPrincipal, aJSONRetVal);
aCloneData, aCpows, aPrincipal, aRetVal);
}
nsresult
@@ -1004,7 +1067,7 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
const StructuredCloneData* aCloneData,
mozilla::jsipc::CpowHolder* aCpows,
nsIPrincipal* aPrincipal,
InfallibleTArray<nsString>* aJSONRetVal)
nsTArray<OwningSerializedStructuredCloneBuffer>* aRetVal)
{
nsAutoTObserverArray<nsMessageListenerInfo, 1>* listeners =
mListeners.Get(aMessage);
@@ -1178,13 +1241,25 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
JS::HandleValueArray(argv), &rval)) {
continue;
}
if (aJSONRetVal) {
nsString json;
if (!JS_Stringify(cx, &rval, JS::NullPtr(), JS::NullHandleValue,
JSONCreator, &json)) {
if (aRetVal) {
JSAutoStructuredCloneBuffer buffer;
if (!buffer.write(cx, rval)) {
nsString msg = aMessage + NS_LITERAL_STRING(": message reply cannot be cloned. Are you trying to send an XPCOM object?");
nsCOMPtr<nsIConsoleService> console(do_GetService(NS_CONSOLESERVICE_CONTRACTID));
if (console) {
nsCOMPtr<nsIScriptError> error(do_CreateInstance(NS_SCRIPTERROR_CONTRACTID));
error->Init(msg, EmptyString(), EmptyString(),
0, 0, nsIScriptError::warningFlag, "chrome javascript");
console->LogMessage(error);
}
JS_ClearPendingException(cx);
continue;
}
aJSONRetVal->AppendElement(json);
OwningSerializedStructuredCloneBuffer* data = aRetVal->AppendElement();
buffer.steal(&data->data, &data->dataLength);
}
}
}
@@ -1194,7 +1269,7 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
aTargetClosed, aMessage,
aIsSync, aCloneData,
aCpows, aPrincipal,
aJSONRetVal) : NS_OK;
aRetVal) : NS_OK;
}
void
@@ -1309,6 +1384,43 @@ nsFrameMessageManager::Disconnect(bool aRemoveFromParent)
}
}
void
nsFrameMessageManager::SetInitialProcessData(JS::HandleValue aInitialData)
{
MOZ_ASSERT(!mChrome);
MOZ_ASSERT(mIsProcessManager);
mInitialProcessData = aInitialData;
}
NS_IMETHODIMP
nsFrameMessageManager::GetInitialProcessData(JSContext* aCx, JS::MutableHandleValue aResult)
{
MOZ_ASSERT(mIsProcessManager);
MOZ_ASSERT_IF(mChrome, IsBroadcaster());
JS::RootedValue init(aCx, mInitialProcessData);
if (mChrome && init.isUndefined()) {
// We create the initial object in the junk scope. If we created it in a
// normal compartment, that compartment would leak until shutdown.
JS::RootedObject global(aCx, xpc::PrivilegedJunkScope());
JSAutoCompartment ac(aCx, global);
JS::RootedObject obj(aCx, JS_NewPlainObject(aCx));
if (!obj) {
return NS_ERROR_OUT_OF_MEMORY;
}
mInitialProcessData.setObject(*obj);
init.setObject(*obj);
}
if (!JS_WrapValue(aCx, &init)) {
return NS_ERROR_OUT_OF_MEMORY;
}
aResult.set(init);
return NS_OK;
}
namespace {
struct MessageManagerReferentCount
@@ -1575,7 +1687,7 @@ nsMessageManagerScriptExecutor::LoadScriptInternal(const nsAString& aURL,
JSContext* cx = aes.cx();
if (script) {
if (aRunInGlobalScope) {
JS::CloneAndExecuteScript(cx, global, script);
JS::CloneAndExecuteScript(cx, script);
} else {
JS::Rooted<JSObject*> scope(cx);
bool ok = js::ExecuteInGlobalAndReturnScope(cx, global, script, &scope);
@@ -1860,7 +1972,7 @@ public:
const mozilla::dom::StructuredCloneData& aData,
JS::Handle<JSObject *> aCpows,
nsIPrincipal* aPrincipal,
InfallibleTArray<nsString>* aJSONRetVal,
nsTArray<OwningSerializedStructuredCloneBuffer>* aRetVal,
bool aIsSync) override
{
mozilla::dom::ContentChild* cc =
@@ -1878,10 +1990,10 @@ public:
}
if (aIsSync) {
return cc->SendSyncMessage(PromiseFlatString(aMessage), data, cpows,
IPC::Principal(aPrincipal), aJSONRetVal);
IPC::Principal(aPrincipal), aRetVal);
}
return cc->SendRpcMessage(PromiseFlatString(aMessage), data, cpows,
IPC::Principal(aPrincipal), aJSONRetVal);
IPC::Principal(aPrincipal), aRetVal);
}
virtual bool DoSendAsyncMessage(JSContext* aCx,
@@ -1951,7 +2063,7 @@ public:
const mozilla::dom::StructuredCloneData& aData,
JS::Handle<JSObject *> aCpows,
nsIPrincipal* aPrincipal,
InfallibleTArray<nsString>* aJSONRetVal,
nsTArray<OwningSerializedStructuredCloneBuffer>* aRetVal,
bool aIsSync) override
{
SameProcessMessageQueue* queue = SameProcessMessageQueue::Get();
@@ -1961,7 +2073,7 @@ public:
SameProcessCpowHolder cpows(js::GetRuntime(aCx), aCpows);
nsRefPtr<nsFrameMessageManager> ppm = nsFrameMessageManager::sSameProcessParentManager;
ppm->ReceiveMessage(static_cast<nsIContentFrameMessageManager*>(ppm.get()), nullptr, aMessage,
true, &aData, &cpows, aPrincipal, aJSONRetVal);
true, &aData, &cpows, aPrincipal, aRetVal);
}
return true;
}