OLD | NEW |
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 Loading... |
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 client->requestPermissions(*permissions, KURL(KURL(), scriptState->execution
Context()->securityOrigin()->toString()), new PermissionsCallback(resolver, perm
issions.release())); | 158 WebVector<WebPermissionType> permissionsCopy = *permissions; |
| 159 client->requestPermissions(permissionsCopy, KURL(KURL(), scriptState->execut
ionContext()->securityOrigin()->toString()), new PermissionsCallback(resolver, p
ermissions.release())); |
159 return promise; | 160 return promise; |
160 } | 161 } |
161 | 162 |
162 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra
wPermission) | 163 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra
wPermission) |
163 { | 164 { |
164 WebPermissionClient* client = getClient(scriptState->executionContext()); | 165 WebPermissionClient* client = getClient(scriptState->executionContext()); |
165 if (!client) | 166 if (!client) |
166 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(InvalidStateError, "In its current state, the global scope can't revoke p
ermissions.")); | 167 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(InvalidStateError, "In its current state, the global scope can't revoke p
ermissions.")); |
167 | 168 |
168 TrackExceptionState exceptionState; | 169 TrackExceptionState exceptionState; |
169 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n
ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState); | 170 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n
ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState); |
170 | 171 |
171 if (exceptionState.hadException()) | 172 if (exceptionState.hadException()) |
172 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str
ing(scriptState->isolate(), exceptionState.message()))); | 173 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str
ing(scriptState->isolate(), exceptionState.message()))); |
173 | 174 |
174 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 175 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
175 ScriptPromise promise = resolver->promise(); | 176 ScriptPromise promise = resolver->promise(); |
176 | 177 |
177 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi
ssion, exceptionState); | 178 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi
ssion, exceptionState); |
178 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type,
exceptionState)) | 179 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type,
exceptionState)) |
179 return promise; | 180 return promise; |
180 | 181 |
181 client->revokePermission(type, KURL(KURL(), scriptState->executionContext()-
>securityOrigin()->toString()), new PermissionCallback(resolver, type)); | 182 client->revokePermission(type, KURL(KURL(), scriptState->executionContext()-
>securityOrigin()->toString()), new PermissionCallback(resolver, type)); |
182 return promise; | 183 return promise; |
183 } | 184 } |
184 | 185 |
185 } // namespace blink | 186 } // namespace blink |
OLD | NEW |