Chromium Code Reviews| Index: Source/modules/serviceworkers/ServiceWorkerClients.cpp |
| diff --git a/Source/modules/serviceworkers/ServiceWorkerClients.cpp b/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
| index 364f5a5cb00e21a2f1811cc08025e3e44d0dddca..d81e6c802474a58cdf91d1e52e06646ff0752e9b 100644 |
| --- a/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
| +++ b/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
| @@ -8,6 +8,8 @@ |
| #include "bindings/core/v8/CallbackPromiseAdapter.h" |
| #include "bindings/core/v8/ScriptPromiseResolver.h" |
| #include "core/dom/ExceptionCode.h" |
| +#include "core/workers/WorkerGlobalScope.h" |
| +#include "core/workers/WorkerLocation.h" |
| #include "modules/serviceworkers/ServiceWorkerError.h" |
| #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
| #include "modules/serviceworkers/ServiceWorkerWindowClient.h" |
| @@ -73,4 +75,31 @@ ScriptPromise ServiceWorkerClients::getAll(ScriptState* scriptState, const Clien |
| return promise; |
| } |
| +ScriptPromise ServiceWorkerClients::openWindow(ScriptState* scriptState, const String& url) |
| +{ |
| + RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState); |
| + ScriptPromise promise = resolver->promise(); |
| + ExecutionContext* context = scriptState->executionContext(); |
| + |
| + KURL parsedUrl = KURL(toWorkerGlobalScope(context)->location()->url(), url); |
| + if (!parsedUrl.isValid()) { |
| + resolver->reject(DOMException::create(SyntaxError, "'" + url + "' is not a valid URL.")); |
| + return promise; |
| + } |
| + |
| + if (!context->securityOrigin()->canRequest(parsedUrl)) { |
| + resolver->reject(DOMException::create(SecurityError, "'" + parsedUrl.string() + "' is cross origin. It cannot be opened.")); |
|
Mike West
2015/01/28 13:43:58
Nit: `parsedUrl.elidedString()`
Nit2: How about 'i
mlamouri (slow - plz ping)
2015/02/02 16:09:26
Done. Done.
|
| + return promise; |
| + } |
| + |
| + if (!context->isWindowInteractionAllowed()) { |
|
Mike West
2015/01/28 13:43:58
Where is this defined?
mlamouri (slow - plz ping)
2015/02/02 16:09:26
https://codereview.chromium.org/866983004
|
| + resolver->reject(DOMException::create(InvalidAccessError, "Not allowed to open a window.")); |
| + return promise; |
| + } |
| + context->consumeWindowInteraction(); |
|
Mike West
2015/01/28 13:43:58
Ditto.
mlamouri (slow - plz ping)
2015/02/02 16:09:26
https://codereview.chromium.org/866983004
|
| + |
| + ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); |
| + return promise; |
| +} |
| + |
| } // namespace blink |