| 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 "modules/permissions/Permissions.h" | 5 #include "modules/permissions/Permissions.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/Dictionary.h" | 7 #include "bindings/core/v8/Dictionary.h" |
| 8 #include "bindings/core/v8/Nullable.h" | 8 #include "bindings/core/v8/Nullable.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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 // If the current origin is a file scheme, it will unlikely return a | 119 // If the current origin is a file scheme, it will unlikely return a |
| 120 // meaningful value because most APIs are broken on file scheme and no | 120 // meaningful value because most APIs are broken on file scheme and no |
| 121 // permission prompt will be shown even if the returned permission will most | 121 // permission prompt will be shown even if the returned permission will most |
| 122 // likely be "prompt". | 122 // likely be "prompt". |
| 123 PermissionDescriptorPtr descriptorCopy = descriptor->Clone(); | 123 PermissionDescriptorPtr descriptorCopy = descriptor->Clone(); |
| 124 service->HasPermission( | 124 service->HasPermission( |
| 125 std::move(descriptor), | 125 std::move(descriptor), |
| 126 scriptState->getExecutionContext()->getSecurityOrigin(), | 126 scriptState->getExecutionContext()->getSecurityOrigin(), |
| 127 convertToBaseCallback(WTF::bind( | 127 convertToBaseCallback(WTF::bind( |
| 128 &Permissions::taskComplete, wrapPersistent(this), | 128 &Permissions::taskComplete, wrapPersistent(this), |
| 129 wrapPersistent(resolver), passed(std::move(descriptorCopy))))); | 129 wrapPersistent(resolver), WTF::passed(std::move(descriptorCopy))))); |
| 130 return promise; | 130 return promise; |
| 131 } | 131 } |
| 132 | 132 |
| 133 ScriptPromise Permissions::request(ScriptState* scriptState, | 133 ScriptPromise Permissions::request(ScriptState* scriptState, |
| 134 const Dictionary& rawPermission) { | 134 const Dictionary& rawPermission) { |
| 135 ExceptionState exceptionState(ExceptionState::GetterContext, "request", | 135 ExceptionState exceptionState(ExceptionState::GetterContext, "request", |
| 136 "Permissions", scriptState->context()->Global(), | 136 "Permissions", scriptState->context()->Global(), |
| 137 scriptState->isolate()); | 137 scriptState->isolate()); |
| 138 PermissionDescriptorPtr descriptor = | 138 PermissionDescriptorPtr descriptor = |
| 139 parsePermission(scriptState, rawPermission, exceptionState); | 139 parsePermission(scriptState, rawPermission, exceptionState); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 152 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); | 152 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
| 153 ScriptPromise promise = resolver->promise(); | 153 ScriptPromise promise = resolver->promise(); |
| 154 | 154 |
| 155 PermissionDescriptorPtr descriptorCopy = descriptor->Clone(); | 155 PermissionDescriptorPtr descriptorCopy = descriptor->Clone(); |
| 156 service->RequestPermission( | 156 service->RequestPermission( |
| 157 std::move(descriptor), | 157 std::move(descriptor), |
| 158 scriptState->getExecutionContext()->getSecurityOrigin(), | 158 scriptState->getExecutionContext()->getSecurityOrigin(), |
| 159 UserGestureIndicator::processingUserGesture(), | 159 UserGestureIndicator::processingUserGesture(), |
| 160 convertToBaseCallback(WTF::bind( | 160 convertToBaseCallback(WTF::bind( |
| 161 &Permissions::taskComplete, wrapPersistent(this), | 161 &Permissions::taskComplete, wrapPersistent(this), |
| 162 wrapPersistent(resolver), passed(std::move(descriptorCopy))))); | 162 wrapPersistent(resolver), WTF::passed(std::move(descriptorCopy))))); |
| 163 return promise; | 163 return promise; |
| 164 } | 164 } |
| 165 | 165 |
| 166 ScriptPromise Permissions::revoke(ScriptState* scriptState, | 166 ScriptPromise Permissions::revoke(ScriptState* scriptState, |
| 167 const Dictionary& rawPermission) { | 167 const Dictionary& rawPermission) { |
| 168 ExceptionState exceptionState(ExceptionState::GetterContext, "revoke", | 168 ExceptionState exceptionState(ExceptionState::GetterContext, "revoke", |
| 169 "Permissions", scriptState->context()->Global(), | 169 "Permissions", scriptState->context()->Global(), |
| 170 scriptState->isolate()); | 170 scriptState->isolate()); |
| 171 PermissionDescriptorPtr descriptor = | 171 PermissionDescriptorPtr descriptor = |
| 172 parsePermission(scriptState, rawPermission, exceptionState); | 172 parsePermission(scriptState, rawPermission, exceptionState); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 184 | 184 |
| 185 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); | 185 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
| 186 ScriptPromise promise = resolver->promise(); | 186 ScriptPromise promise = resolver->promise(); |
| 187 | 187 |
| 188 PermissionDescriptorPtr descriptorCopy = descriptor->Clone(); | 188 PermissionDescriptorPtr descriptorCopy = descriptor->Clone(); |
| 189 service->RevokePermission( | 189 service->RevokePermission( |
| 190 std::move(descriptor), | 190 std::move(descriptor), |
| 191 scriptState->getExecutionContext()->getSecurityOrigin(), | 191 scriptState->getExecutionContext()->getSecurityOrigin(), |
| 192 convertToBaseCallback(WTF::bind( | 192 convertToBaseCallback(WTF::bind( |
| 193 &Permissions::taskComplete, wrapPersistent(this), | 193 &Permissions::taskComplete, wrapPersistent(this), |
| 194 wrapPersistent(resolver), passed(std::move(descriptorCopy))))); | 194 wrapPersistent(resolver), WTF::passed(std::move(descriptorCopy))))); |
| 195 return promise; | 195 return promise; |
| 196 } | 196 } |
| 197 | 197 |
| 198 ScriptPromise Permissions::requestAll( | 198 ScriptPromise Permissions::requestAll( |
| 199 ScriptState* scriptState, | 199 ScriptState* scriptState, |
| 200 const Vector<Dictionary>& rawPermissions) { | 200 const Vector<Dictionary>& rawPermissions) { |
| 201 ExceptionState exceptionState(ExceptionState::GetterContext, "request", | 201 ExceptionState exceptionState(ExceptionState::GetterContext, "request", |
| 202 "Permissions", scriptState->context()->Global(), | 202 "Permissions", scriptState->context()->Global(), |
| 203 scriptState->isolate()); | 203 scriptState->isolate()); |
| 204 Vector<PermissionDescriptorPtr> internalPermissions; | 204 Vector<PermissionDescriptorPtr> internalPermissions; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 | 241 |
| 242 Vector<PermissionDescriptorPtr> internalPermissionsCopy; | 242 Vector<PermissionDescriptorPtr> internalPermissionsCopy; |
| 243 internalPermissionsCopy.reserveCapacity(internalPermissions.size()); | 243 internalPermissionsCopy.reserveCapacity(internalPermissions.size()); |
| 244 for (const auto& descriptor : internalPermissions) | 244 for (const auto& descriptor : internalPermissions) |
| 245 internalPermissionsCopy.append(descriptor->Clone()); | 245 internalPermissionsCopy.append(descriptor->Clone()); |
| 246 | 246 |
| 247 service->RequestPermissions( | 247 service->RequestPermissions( |
| 248 std::move(internalPermissions), | 248 std::move(internalPermissions), |
| 249 scriptState->getExecutionContext()->getSecurityOrigin(), | 249 scriptState->getExecutionContext()->getSecurityOrigin(), |
| 250 UserGestureIndicator::processingUserGesture(), | 250 UserGestureIndicator::processingUserGesture(), |
| 251 convertToBaseCallback(WTF::bind( | 251 convertToBaseCallback( |
| 252 &Permissions::batchTaskComplete, wrapPersistent(this), | 252 WTF::bind(&Permissions::batchTaskComplete, wrapPersistent(this), |
| 253 wrapPersistent(resolver), passed(std::move(internalPermissionsCopy)), | 253 wrapPersistent(resolver), |
| 254 passed(std::move(callerIndexToInternalIndex))))); | 254 WTF::passed(std::move(internalPermissionsCopy)), |
| 255 WTF::passed(std::move(callerIndexToInternalIndex))))); |
| 255 return promise; | 256 return promise; |
| 256 } | 257 } |
| 257 | 258 |
| 258 PermissionService* Permissions::getService(ExecutionContext* executionContext) { | 259 PermissionService* Permissions::getService(ExecutionContext* executionContext) { |
| 259 if (!m_service && | 260 if (!m_service && |
| 260 connectToPermissionService(executionContext, mojo::GetProxy(&m_service))) | 261 connectToPermissionService(executionContext, mojo::GetProxy(&m_service))) |
| 261 m_service.set_connection_error_handler(convertToBaseCallback(WTF::bind( | 262 m_service.set_connection_error_handler(convertToBaseCallback(WTF::bind( |
| 262 &Permissions::serviceConnectionError, wrapWeakPersistent(this)))); | 263 &Permissions::serviceConnectionError, wrapWeakPersistent(this)))); |
| 263 return m_service.get(); | 264 return m_service.get(); |
| 264 } | 265 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 result.reserveInitialCapacity(callerIndexToInternalIndex.size()); | 301 result.reserveInitialCapacity(callerIndexToInternalIndex.size()); |
| 301 for (int internalIndex : callerIndexToInternalIndex) { | 302 for (int internalIndex : callerIndexToInternalIndex) { |
| 302 result.append(PermissionStatus::createAndListen( | 303 result.append(PermissionStatus::createAndListen( |
| 303 resolver->getExecutionContext(), results[internalIndex], | 304 resolver->getExecutionContext(), results[internalIndex], |
| 304 descriptors[internalIndex]->Clone())); | 305 descriptors[internalIndex]->Clone())); |
| 305 } | 306 } |
| 306 resolver->resolve(result); | 307 resolver->resolve(result); |
| 307 } | 308 } |
| 308 | 309 |
| 309 } // namespace blink | 310 } // namespace blink |
| OLD | NEW |