| 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/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h" | 5 #include "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
| 9 #include "core/dom/DOMException.h" | 9 #include "core/dom/DOMException.h" |
| 10 #include "core/dom/Document.h" | 10 #include "core/dom/Document.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 webConfig.distinctiveIdentifier = | 168 webConfig.distinctiveIdentifier = |
| 169 convertMediaKeysRequirement(config.distinctiveIdentifier()); | 169 convertMediaKeysRequirement(config.distinctiveIdentifier()); |
| 170 | 170 |
| 171 DCHECK(config.hasPersistentState()); | 171 DCHECK(config.hasPersistentState()); |
| 172 webConfig.persistentState = | 172 webConfig.persistentState = |
| 173 convertMediaKeysRequirement(config.persistentState()); | 173 convertMediaKeysRequirement(config.persistentState()); |
| 174 | 174 |
| 175 if (config.hasSessionTypes()) { | 175 if (config.hasSessionTypes()) { |
| 176 webConfig.sessionTypes = convertSessionTypes(config.sessionTypes()); | 176 webConfig.sessionTypes = convertSessionTypes(config.sessionTypes()); |
| 177 } else { | 177 } else { |
| 178 // From the spec (http://w3c.github.io/encrypted-media/#idl-def-mediakeysy
stemconfiguration): | 178 // From the spec |
| 179 // (http://w3c.github.io/encrypted-media/#idl-def-mediakeysystemconfigurat
ion): |
| 179 // If this member is not present when the dictionary is passed to | 180 // If this member is not present when the dictionary is passed to |
| 180 // requestMediaKeySystemAccess(), the dictionary will be treated | 181 // requestMediaKeySystemAccess(), the dictionary will be treated |
| 181 // as if this member is set to [ "temporary" ]. | 182 // as if this member is set to [ "temporary" ]. |
| 182 WebVector<WebEncryptedMediaSessionType> sessionTypes( | 183 WebVector<WebEncryptedMediaSessionType> sessionTypes( |
| 183 static_cast<size_t>(1)); | 184 static_cast<size_t>(1)); |
| 184 sessionTypes[0] = WebEncryptedMediaSessionType::Temporary; | 185 sessionTypes[0] = WebEncryptedMediaSessionType::Temporary; |
| 185 webConfig.sessionTypes = sessionTypes; | 186 webConfig.sessionTypes = sessionTypes; |
| 186 } | 187 } |
| 187 | 188 |
| 188 // If |label| is not present, it will be a null string. | 189 // If |label| is not present, it will be a null string. |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 WebEncryptedMediaClient* mediaClient = | 368 WebEncryptedMediaClient* mediaClient = |
| 368 controller->encryptedMediaClient(executionContext); | 369 controller->encryptedMediaClient(executionContext); |
| 369 mediaClient->requestMediaKeySystemAccess( | 370 mediaClient->requestMediaKeySystemAccess( |
| 370 WebEncryptedMediaRequest(initializer)); | 371 WebEncryptedMediaRequest(initializer)); |
| 371 | 372 |
| 372 // 7. Return promise. | 373 // 7. Return promise. |
| 373 return promise; | 374 return promise; |
| 374 } | 375 } |
| 375 | 376 |
| 376 } // namespace blink | 377 } // namespace blink |
| OLD | NEW |