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

Side by Side Diff: third_party/WebKit/Source/modules/permissions/Permissions.cpp

Issue 1369723002: Revert of permissions: add layout tests for multiple requests (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@fix-request-test
Patch Set: Created 5 years, 2 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 | « third_party/WebKit/LayoutTests/http/tests/permissions/chromium/test-request-multiple-worker.html ('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/permissions/Permissions.h" 6 #include "modules/permissions/Permissions.h"
7 7
8 #include "bindings/core/v8/Dictionary.h" 8 #include "bindings/core/v8/Dictionary.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 149 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
150 ScriptPromise promise = resolver->promise(); 150 ScriptPromise promise = resolver->promise();
151 151
152 // We need to do this is a separate loop because we can't create the Resolve r and Promise untile we are clear of all parsing/type errors. 152 // We need to do this is a separate loop because we can't create the Resolve r and Promise untile we are clear of all parsing/type errors.
153 for (size_t i = 0; i < rawPermissions.size(); ++i) { 153 for (size_t i = 0; i < rawPermissions.size(); ++i) {
154 if (handleNotSupportedPermission(scriptState, rawPermissions[i], resolve r, (*permissions)[i], exceptionState)) 154 if (handleNotSupportedPermission(scriptState, rawPermissions[i], resolve r, (*permissions)[i], exceptionState))
155 return promise; 155 return promise;
156 } 156 }
157 157
158 WebVector<WebPermissionType> permissionsCopy = *permissions; 158 client->requestPermissions(*permissions, KURL(KURL(), scriptState->execution Context()->securityOrigin()->toString()), new PermissionsCallback(resolver, perm issions.release()));
159 client->requestPermissions(permissionsCopy, KURL(KURL(), scriptState->execut ionContext()->securityOrigin()->toString()), new PermissionsCallback(resolver, p ermissions.release()));
160 return promise; 159 return promise;
161 } 160 }
162 161
163 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra wPermission) 162 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra wPermission)
164 { 163 {
165 WebPermissionClient* client = getClient(scriptState->executionContext()); 164 WebPermissionClient* client = getClient(scriptState->executionContext());
166 if (!client) 165 if (!client)
167 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't revoke p ermissions.")); 166 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't revoke p ermissions."));
168 167
169 TrackExceptionState exceptionState; 168 TrackExceptionState exceptionState;
170 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState); 169 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState);
171 170
172 if (exceptionState.hadException()) 171 if (exceptionState.hadException())
173 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str ing(scriptState->isolate(), exceptionState.message()))); 172 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str ing(scriptState->isolate(), exceptionState.message())));
174 173
175 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 174 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
176 ScriptPromise promise = resolver->promise(); 175 ScriptPromise promise = resolver->promise();
177 176
178 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi ssion, exceptionState); 177 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi ssion, exceptionState);
179 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type, exceptionState)) 178 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type, exceptionState))
180 return promise; 179 return promise;
181 180
182 client->revokePermission(type, KURL(KURL(), scriptState->executionContext()- >securityOrigin()->toString()), new PermissionCallback(resolver, type)); 181 client->revokePermission(type, KURL(KURL(), scriptState->executionContext()- >securityOrigin()->toString()), new PermissionCallback(resolver, type));
183 return promise; 182 return promise;
184 } 183 }
185 184
186 } // namespace blink 185 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/permissions/chromium/test-request-multiple-worker.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698