mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
a9171b7b23
- Bug 1201135 - Rename pldhash.{h,cpp} to PLDHashTable.{h,cpp}. r=mccr8. (0600308646)
- Bug 1203680 P4 Fix bug in nsStorageStream with reading streams create#d efore data is populated. r=froydnj (a51018d7c4)
- Bug 1156109 - Make nsStorageInputStream::mStorageStream an nsRefPtr; r=froydnj (ac2083b0a4)
- Bug 1158735 - FetchEvent.client asserting in onFetch when there's no document. r=bkelly (c67f9dc127)
- Bug 1187766 - Test loading plugins scenarios with fetch interception. r=bkelly (9593999e0b)
- Bug 1182103 - Test EventSource scenarios with fetch interception. r=bkelly (c45c0a9840)
- Bug 1187470 - ServiceWorker scripts should not be treated parser warnings as errors, r=bkelly (a87dcd8b46)
- Bug 1144660 - client.focus() adds window interaction checks and directly uses DOMServiceWorkerFocusClient to focus window. r=ehsan,dao (66293cab2c)
- Bug 1176988 - Patch 1 - Always hit cache irrespective of HTTP method if channel is being intercepted. r=jdm (fa57442870)
- Bug 1176988 - Patch 2 - Remove XHR cache bypass in cast of POST request. r=jdm (7009c4cfb8)
- Bug 1182120 - Test XMLDocument.load() with fetch interception. r=bkelly (fae709bda0)
- Bug 1176988 - Patch 3 - Tests. r=jdm (bfb5e84490)
- Bug 815299 - Part 1: Add an API for setting an empty request header on an HTTP channel; r=dragana (ad3846e6c6)
- Bug 815299 - Part 2: Accept empty HTTP headers in fetch; r=jdm (f4d344d4a3)
- Bug 815299 - Part 3: Accept empty HTTP headers in XHR; r=jdm (8ed9b6251b)
- Bug 1198544 - Prevent FetchDriver from creating multiple responses if OnStopRequest yields a failing status code. r=nsm (e6ce3a3621)
- Bug 1171941 - Removed an incorrect URL prefix from fetch_tests.js. r=jdm (bbc57bc7e3)
- Bug 1199693 - Test CORS preflight interception with and without an internal redirect; r=jdm (6dda8cb00e)
- Bug 1190703 - Relax scope resolution assertion in ServiceWorkerContainer::Register. r=bkelly (75a095f761)
- Bug 1181037 - Use entry settings object's base URL. r=ehsan (4be1b9e1cb)
- Bug 1194562 - Pass wide strings to ThrowTypeError. r=mccr8 (360113dbb9)
- Bug 1185640 - serviceworker register() should not accept escaped slashes. r=bkelly (3c74e3c561)
- namespace (0853d1387f)
- Bug 1187350 - update() should return a Promise. r=ehsan,catalinb (5fa3367032)
- Bug 1183628 - Update web-platform-tests expected data to revision 593fd27931d7e9d573d2796fe10df9fff778d56f, a=testonly (de41f55433)
- Bug 1180861 - Various ServiceWorker registration fixes to get test passing. r=bkelly,jgraham. (e1e5be174b)
- Bug 1203680 P1 Test file blob uploads with service worker interception. r=nsm (fa7441fd83)
- Bug 1203680 P2 Implement an NS_InputStreamIsCloneable() method. r=froydnj (5067d82f06)
- Bug 1203680 P3 Add a method to ensure an http upload stream is directly cloneable. r=mcmanus (45aed67d00)
163 lines
4.9 KiB
C++
163 lines
4.9 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 "ServiceWorkerWindowClient.h"
|
|
|
|
#include "mozilla/dom/ClientBinding.h"
|
|
#include "mozilla/dom/Promise.h"
|
|
#include "mozilla/dom/PromiseWorkerProxy.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
#include "nsGlobalWindow.h"
|
|
#include "WorkerPrivate.h"
|
|
|
|
using namespace mozilla::dom;
|
|
using namespace mozilla::dom::workers;
|
|
|
|
using mozilla::UniquePtr;
|
|
|
|
JSObject*
|
|
ServiceWorkerWindowClient::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return WindowClientBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
namespace {
|
|
|
|
// Passing a null clientInfo will reject the promise with InvalidAccessError.
|
|
class ResolveOrRejectPromiseRunnable final : public WorkerRunnable
|
|
{
|
|
nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
UniquePtr<ServiceWorkerClientInfo> mClientInfo;
|
|
|
|
public:
|
|
ResolveOrRejectPromiseRunnable(WorkerPrivate* aWorkerPrivate,
|
|
PromiseWorkerProxy* aPromiseProxy,
|
|
UniquePtr<ServiceWorkerClientInfo>&& aClientInfo)
|
|
: WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount)
|
|
, mPromiseProxy(aPromiseProxy)
|
|
, mClientInfo(Move(aClientInfo))
|
|
{
|
|
AssertIsOnMainThread();
|
|
}
|
|
|
|
bool
|
|
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
|
|
{
|
|
MOZ_ASSERT(aWorkerPrivate);
|
|
aWorkerPrivate->AssertIsOnWorkerThread();
|
|
|
|
Promise* promise = mPromiseProxy->GetWorkerPromise();
|
|
MOZ_ASSERT(promise);
|
|
|
|
if (mClientInfo) {
|
|
nsRefPtr<ServiceWorkerWindowClient> client =
|
|
new ServiceWorkerWindowClient(promise->GetParentObject(), *mClientInfo);
|
|
promise->MaybeResolve(client);
|
|
} else {
|
|
promise->MaybeReject(NS_ERROR_DOM_INVALID_ACCESS_ERR);
|
|
}
|
|
|
|
// Release the reference on the worker thread.
|
|
mPromiseProxy->CleanUp(aCx);
|
|
|
|
return true;
|
|
}
|
|
};
|
|
|
|
class ClientFocusRunnable final : public nsRunnable
|
|
{
|
|
uint64_t mWindowId;
|
|
nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
|
|
public:
|
|
ClientFocusRunnable(uint64_t aWindowId, PromiseWorkerProxy* aPromiseProxy)
|
|
: mWindowId(aWindowId)
|
|
, mPromiseProxy(aPromiseProxy)
|
|
{
|
|
MOZ_ASSERT(mPromiseProxy);
|
|
MOZ_ASSERT(mPromiseProxy->GetWorkerPromise());
|
|
}
|
|
|
|
NS_IMETHOD
|
|
Run() override
|
|
{
|
|
AssertIsOnMainThread();
|
|
nsGlobalWindow* window = nsGlobalWindow::GetInnerWindowWithId(mWindowId);
|
|
UniquePtr<ServiceWorkerClientInfo> clientInfo;
|
|
|
|
if (window) {
|
|
nsContentUtils::DispatchChromeEvent(window->GetExtantDoc(), window->GetOuterWindow(), NS_LITERAL_STRING("DOMServiceWorkerFocusClient"), true, true);
|
|
clientInfo.reset(new ServiceWorkerClientInfo(window->GetDocument(),
|
|
window->GetOuterWindow()));
|
|
}
|
|
|
|
DispatchResult(Move(clientInfo));
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
void
|
|
DispatchResult(UniquePtr<ServiceWorkerClientInfo>&& aClientInfo)
|
|
{
|
|
WorkerPrivate* workerPrivate = mPromiseProxy->GetWorkerPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
|
|
nsRefPtr<ResolveOrRejectPromiseRunnable> resolveRunnable =
|
|
new ResolveOrRejectPromiseRunnable(workerPrivate, mPromiseProxy,
|
|
Move(aClientInfo));
|
|
|
|
AutoJSAPI jsapi;
|
|
jsapi.Init();
|
|
JSContext* cx = jsapi.cx();
|
|
if (!resolveRunnable->Dispatch(cx)) {
|
|
nsRefPtr<PromiseWorkerProxyControlRunnable> controlRunnable =
|
|
new PromiseWorkerProxyControlRunnable(workerPrivate, mPromiseProxy);
|
|
if (!controlRunnable->Dispatch(cx)) {
|
|
NS_RUNTIMEABORT("Failed to dispatch Focus promise control runnable.");
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
} // anonymous namespace
|
|
|
|
already_AddRefed<Promise>
|
|
ServiceWorkerWindowClient::Focus(ErrorResult& aRv) const
|
|
{
|
|
WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
workerPrivate->AssertIsOnWorkerThread();
|
|
|
|
nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetParentObject());
|
|
MOZ_ASSERT(global);
|
|
|
|
nsRefPtr<Promise> promise = Promise::Create(global, aRv);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (workerPrivate->GlobalScope()->WindowInteractionAllowed()) {
|
|
nsRefPtr<PromiseWorkerProxy> promiseProxy =
|
|
PromiseWorkerProxy::Create(workerPrivate, promise);
|
|
if (!promiseProxy->GetWorkerPromise()) {
|
|
// Don't dispatch if adding the worker feature failed.
|
|
return promise.forget();
|
|
}
|
|
|
|
nsRefPtr<ClientFocusRunnable> r = new ClientFocusRunnable(mWindowId,
|
|
promiseProxy);
|
|
aRv = NS_DispatchToMainThread(r);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
promise->MaybeReject(aRv);
|
|
}
|
|
} else {
|
|
promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR);
|
|
}
|
|
|
|
return promise.forget();
|
|
}
|