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

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

Issue 1209933003: ServiceWorkerClients::openWindow() should reject with TypeError for an invalid URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 months 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
« no previous file with comments | « LayoutTests/http/tests/serviceworker/chromium/resources/clients-openwindow.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 } 108 }
109 109
110 ScriptPromise ServiceWorkerClients::openWindow(ScriptState* scriptState, const S tring& url) 110 ScriptPromise ServiceWorkerClients::openWindow(ScriptState* scriptState, const S tring& url)
111 { 111 {
112 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); 112 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);
113 ScriptPromise promise = resolver->promise(); 113 ScriptPromise promise = resolver->promise();
114 ExecutionContext* context = scriptState->executionContext(); 114 ExecutionContext* context = scriptState->executionContext();
115 115
116 KURL parsedUrl = KURL(toWorkerGlobalScope(context)->location()->url(), url); 116 KURL parsedUrl = KURL(toWorkerGlobalScope(context)->location()->url(), url);
117 if (!parsedUrl.isValid()) { 117 if (!parsedUrl.isValid()) {
118 resolver->reject(DOMException::create(SyntaxError, "'" + url + "' is not a valid URL.")); 118 resolver->reject(V8ThrowException::createTypeError(scriptState->isolate( ), "'" + url + "' is not a valid URL."));
119 return promise; 119 return promise;
120 } 120 }
121 121
122 if (!context->securityOrigin()->canDisplay(parsedUrl)) { 122 if (!context->securityOrigin()->canDisplay(parsedUrl)) {
123 resolver->reject(DOMException::create(SecurityError, "'" + parsedUrl.eli dedString() + "' cannot be opened.")); 123 resolver->reject(DOMException::create(SecurityError, "'" + parsedUrl.eli dedString() + "' cannot be opened."));
124 return promise; 124 return promise;
125 } 125 }
126 126
127 if (!context->isWindowInteractionAllowed()) { 127 if (!context->isWindowInteractionAllowed()) {
128 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t o open a window.")); 128 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t o open a window."));
129 return promise; 129 return promise;
130 } 130 }
131 context->consumeWindowInteraction(); 131 context->consumeWindowInteraction();
132 132
133 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); 133 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver));
134 return promise; 134 return promise;
135 } 135 }
136 136
137 } // namespace blink 137 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/serviceworker/chromium/resources/clients-openwindow.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698