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

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

Issue 1376523006: Revert of permissions: add layout tests for multiple requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/Nullable.h" 9 #include "bindings/core/v8/Nullable.h"
10 #include "bindings/core/v8/ScriptPromise.h" 10 #include "bindings/core/v8/ScriptPromise.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 Nullable<WebPermissionType> type = parsePermission(scriptState, rawPermi ssion, exceptionState); 153 Nullable<WebPermissionType> type = parsePermission(scriptState, rawPermi ssion, exceptionState);
154 if (exceptionState.hadException()) 154 if (exceptionState.hadException())
155 return exceptionState.reject(scriptState); 155 return exceptionState.reject(scriptState);
156 156
157 permissions->operator[](i) = type.get(); 157 permissions->operator[](i) = type.get();
158 } 158 }
159 159
160 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 160 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
161 ScriptPromise promise = resolver->promise(); 161 ScriptPromise promise = resolver->promise();
162 162
163 WebVector<WebPermissionType> permissionsCopy = *permissions; 163 client->requestPermissions(*permissions, KURL(KURL(), scriptState->execution Context()->securityOrigin()->toString()), new PermissionsCallback(resolver, perm issions.release()));
164 client->requestPermissions(permissionsCopy, KURL(KURL(), scriptState->execut ionContext()->securityOrigin()->toString()), new PermissionsCallback(resolver, p ermissions.release()));
165 return promise; 164 return promise;
166 } 165 }
167 166
168 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra wPermission) 167 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra wPermission)
169 { 168 {
170 WebPermissionClient* client = getClient(scriptState->executionContext()); 169 WebPermissionClient* client = getClient(scriptState->executionContext());
171 if (!client) 170 if (!client)
172 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't revoke p ermissions.")); 171 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't revoke p ermissions."));
173 172
174 ExceptionState exceptionState(ExceptionState::GetterContext, "revoke", "Per missions", scriptState->context()->Global(), scriptState->isolate()); 173 ExceptionState exceptionState(ExceptionState::GetterContext, "revoke", "Per missions", scriptState->context()->Global(), scriptState->isolate());
175 Nullable<WebPermissionType> type = parsePermission(scriptState, rawPermissio n, exceptionState); 174 Nullable<WebPermissionType> type = parsePermission(scriptState, rawPermissio n, exceptionState);
176 if (exceptionState.hadException()) 175 if (exceptionState.hadException())
177 return exceptionState.reject(scriptState); 176 return exceptionState.reject(scriptState);
178 177
179 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 178 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
180 ScriptPromise promise = resolver->promise(); 179 ScriptPromise promise = resolver->promise();
181 180
182 client->revokePermission(type.get(), KURL(KURL(), scriptState->executionCont ext()->securityOrigin()->toString()), new PermissionCallback(resolver, type.get( ))); 181 client->revokePermission(type.get(), KURL(KURL(), scriptState->executionCont ext()->securityOrigin()->toString()), new PermissionCallback(resolver, type.get( )));
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