Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerClients.cpp

Issue 1481523006: ServiceWorker: Should throw TypeError instead of Unknown/SecurityError. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/serviceworkers/ServiceWorkerClients.h" 6 #include "modules/serviceworkers/ServiceWorkerClients.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "core/dom/DOMException.h" 10 #include "core/dom/DOMException.h"
11 #include "core/dom/ExceptionCode.h" 11 #include "core/dom/ExceptionCode.h"
12 #include "core/workers/WorkerGlobalScope.h" 12 #include "core/workers/WorkerGlobalScope.h"
13 #include "core/workers/WorkerLocation.h" 13 #include "core/workers/WorkerLocation.h"
14 #include "modules/serviceworkers/ServiceWorkerError.h" 14 #include "modules/serviceworkers/ServiceWorkerError.h"
15 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" 15 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
16 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" 16 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
17 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"
17 #include "public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptio ns.h" 18 #include "public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptio ns.h"
18 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h" 19 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
19 #include "wtf/OwnPtr.h" 20 #include "wtf/OwnPtr.h"
20 #include "wtf/PassOwnPtr.h" 21 #include "wtf/PassOwnPtr.h"
21 #include "wtf/RefPtr.h" 22 #include "wtf/RefPtr.h"
22 #include "wtf/Vector.h" 23 #include "wtf/Vector.h"
23 24
24 namespace blink { 25 namespace blink {
25 26
26 namespace { 27 namespace {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 resolver->reject(DOMException::create(SecurityError, "'" + parsedUrl.eli dedString() + "' cannot be opened.")); 121 resolver->reject(DOMException::create(SecurityError, "'" + parsedUrl.eli dedString() + "' cannot be opened."));
121 return promise; 122 return promise;
122 } 123 }
123 124
124 if (!context->isWindowInteractionAllowed()) { 125 if (!context->isWindowInteractionAllowed()) {
125 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t o open a window.")); 126 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t o open a window."));
126 return promise; 127 return promise;
127 } 128 }
128 context->consumeWindowInteraction(); 129 context->consumeWindowInteraction();
129 130
130 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); 131 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Nav igateClientCallback(resolver));
131 return promise; 132 return promise;
132 } 133 }
133 134
134 } // namespace blink 135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698