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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
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" |
11 #include "bindings/core/v8/ScriptState.h" | 11 #include "bindings/core/v8/ScriptState.h" |
12 #include "bindings/core/v8/V8ThrowException.h" | 12 #include "bindings/core/v8/V8ThrowException.h" |
13 #include "core/dom/DOMException.h" | 13 #include "core/dom/DOMException.h" |
14 #include "core/dom/Document.h" | 14 #include "core/dom/Document.h" |
15 #include "core/dom/ExceptionCode.h" | 15 #include "core/dom/ExceptionCode.h" |
16 #include "core/frame/Deprecation.h" | 16 #include "core/frame/Deprecation.h" |
17 #include "core/frame/Settings.h" | 17 #include "core/frame/Settings.h" |
18 #include "core/inspector/ConsoleMessage.h" | 18 #include "core/inspector/ConsoleMessage.h" |
19 #include "modules/encryptedmedia/EncryptedMediaUtils.h" | 19 #include "modules/encryptedmedia/EncryptedMediaUtils.h" |
20 #include "modules/encryptedmedia/MediaKeySession.h" | 20 #include "modules/encryptedmedia/MediaKeySession.h" |
21 #include "modules/encryptedmedia/MediaKeySystemAccess.h" | 21 #include "modules/encryptedmedia/MediaKeySystemAccess.h" |
22 #include "modules/encryptedmedia/MediaKeysController.h" | 22 #include "modules/encryptedmedia/MediaKeysController.h" |
23 #include "platform/EncryptedMediaRequest.h" | 23 #include "platform/EncryptedMediaRequest.h" |
24 #include "platform/Histogram.h" | 24 #include "platform/Histogram.h" |
25 #include "platform/network/ParsedContentType.h" | 25 #include "platform/network/ParsedContentType.h" |
| 26 #include "platform/network/mime/ContentType.h" |
26 #include "public/platform/WebEncryptedMediaClient.h" | 27 #include "public/platform/WebEncryptedMediaClient.h" |
27 #include "public/platform/WebEncryptedMediaRequest.h" | 28 #include "public/platform/WebEncryptedMediaRequest.h" |
28 #include "public/platform/WebMediaKeySystemConfiguration.h" | 29 #include "public/platform/WebMediaKeySystemConfiguration.h" |
29 #include "public/platform/WebMediaKeySystemMediaCapability.h" | 30 #include "public/platform/WebMediaKeySystemMediaCapability.h" |
30 #include "public/platform/WebVector.h" | 31 #include "public/platform/WebVector.h" |
31 #include "wtf/PtrUtil.h" | 32 #include "wtf/PtrUtil.h" |
32 #include "wtf/Vector.h" | 33 #include "wtf/Vector.h" |
33 #include "wtf/text/WTFString.h" | 34 #include "wtf/text/WTFString.h" |
34 | 35 |
35 namespace blink { | 36 namespace blink { |
36 | 37 |
37 namespace { | 38 namespace { |
38 | 39 |
39 static WebVector<WebEncryptedMediaInitDataType> convertInitDataTypes( | 40 static WebVector<WebEncryptedMediaInitDataType> convertInitDataTypes( |
40 const Vector<String>& initDataTypes) { | 41 const Vector<String>& initDataTypes) { |
41 WebVector<WebEncryptedMediaInitDataType> result(initDataTypes.size()); | 42 WebVector<WebEncryptedMediaInitDataType> result(initDataTypes.size()); |
42 for (size_t i = 0; i < initDataTypes.size(); ++i) | 43 for (size_t i = 0; i < initDataTypes.size(); ++i) |
43 result[i] = EncryptedMediaUtils::convertToInitDataType(initDataTypes[i]); | 44 result[i] = EncryptedMediaUtils::convertToInitDataType(initDataTypes[i]); |
44 return result; | 45 return result; |
45 } | 46 } |
46 | 47 |
47 static WebVector<WebMediaKeySystemMediaCapability> convertCapabilities( | 48 static WebVector<WebMediaKeySystemMediaCapability> convertCapabilities( |
48 const HeapVector<MediaKeySystemMediaCapability>& capabilities) { | 49 const HeapVector<MediaKeySystemMediaCapability>& capabilities) { |
49 WebVector<WebMediaKeySystemMediaCapability> result(capabilities.size()); | 50 WebVector<WebMediaKeySystemMediaCapability> result(capabilities.size()); |
50 for (size_t i = 0; i < capabilities.size(); ++i) { | 51 for (size_t i = 0; i < capabilities.size(); ++i) { |
51 const WebString& contentType = capabilities[i].contentType(); | 52 const WebString& contentType = capabilities[i].contentType(); |
52 result[i].contentType = contentType; | 53 result[i].contentType = contentType; |
53 if (isValidContentType(contentType)) { | 54 if (isValidContentType(contentType)) { |
54 // FIXME: Fail if there are unrecognized parameters. | 55 // FIXME: Fail if there are unrecognized parameters. |
55 ParsedContentType type(capabilities[i].contentType()); | 56 // http://crbug.com/690131 |
56 result[i].mimeType = type.mimeType(); | 57 ContentType type(capabilities[i].contentType()); |
57 result[i].codecs = type.parameterValueForName("codecs"); | 58 result[i].mimeType = type.type(); |
| 59 result[i].codecs = type.parameter("codecs"); |
58 } | 60 } |
59 result[i].robustness = capabilities[i].robustness(); | 61 result[i].robustness = capabilities[i].robustness(); |
60 } | 62 } |
61 return result; | 63 return result; |
62 } | 64 } |
63 | 65 |
64 static WebMediaKeySystemConfiguration::Requirement convertMediaKeysRequirement( | 66 static WebMediaKeySystemConfiguration::Requirement convertMediaKeysRequirement( |
65 const String& requirement) { | 67 const String& requirement) { |
66 if (requirement == "required") | 68 if (requirement == "required") |
67 return WebMediaKeySystemConfiguration::Requirement::Required; | 69 return WebMediaKeySystemConfiguration::Requirement::Required; |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
375 WebEncryptedMediaClient* mediaClient = | 377 WebEncryptedMediaClient* mediaClient = |
376 controller->encryptedMediaClient(executionContext); | 378 controller->encryptedMediaClient(executionContext); |
377 mediaClient->requestMediaKeySystemAccess( | 379 mediaClient->requestMediaKeySystemAccess( |
378 WebEncryptedMediaRequest(initializer)); | 380 WebEncryptedMediaRequest(initializer)); |
379 | 381 |
380 // 7. Return promise. | 382 // 7. Return promise. |
381 return promise; | 383 return promise; |
382 } | 384 } |
383 | 385 |
384 } // namespace blink | 386 } // namespace blink |
OLD | NEW |