| Index: Source/web/WebMediaPlayerClientImpl.cpp
|
| diff --git a/Source/web/WebMediaPlayerClientImpl.cpp b/Source/web/WebMediaPlayerClientImpl.cpp
|
| index c25c4a808fa1d8472480ac26cd1f7999ad3d7f9d..0044038de6f867cf606dc046e53eca18ea990b43 100644
|
| --- a/Source/web/WebMediaPlayerClientImpl.cpp
|
| +++ b/Source/web/WebMediaPlayerClientImpl.cpp
|
| @@ -123,11 +123,27 @@ void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebS
|
| HTMLMediaElementEncryptedMedia::keyMessage(mediaElement(), keySystem, sessionId, message, messageLength, defaultURL);
|
| }
|
|
|
| -void WebMediaPlayerClientImpl::encrypted(const WebString& initDataType, const unsigned char* initData, unsigned initDataLength)
|
| +void WebMediaPlayerClientImpl::encrypted(WebEncryptedMediaInitDataType initDataType, const unsigned char* initData, unsigned initDataLength)
|
| {
|
| HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), initDataType, initData, initDataLength);
|
| }
|
|
|
| +// FIXME: Remove this once Chromium updated to use enum type.
|
| +void WebMediaPlayerClientImpl::encrypted(const WebString& initDataType, const unsigned char* initData, unsigned initDataLength)
|
| +{
|
| + WebEncryptedMediaInitDataType newInitDataType;
|
| + if (initDataType == "cenc") {
|
| + newInitDataType = WebEncryptedMediaInitDataType::Cenc;
|
| + } else if (initDataType == "webm") {
|
| + newInitDataType = WebEncryptedMediaInitDataType::Webm;
|
| + } else if (initDataType == "keyids") {
|
| + newInitDataType = WebEncryptedMediaInitDataType::Keyids;
|
| + } else {
|
| + newInitDataType = WebEncryptedMediaInitDataType::Unknown;
|
| + }
|
| + HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), newInitDataType, initData, initDataLength);
|
| +}
|
| +
|
| void WebMediaPlayerClientImpl::didBlockPlaybackWaitingForKey()
|
| {
|
| HTMLMediaElementEncryptedMedia::didBlockPlaybackWaitingForKey(mediaElement());
|
|
|