| Index: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| index 8623477a3c20712848266c9422a65805ba6eed3a..00d82db6edae7171bca575f1277a3bbb3c16792f 100644
|
| --- a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| @@ -168,8 +168,8 @@ void SetMediaKeysHandler::clearExistingMediaKeys()
|
| // attribute to decrypt media data and remove the association
|
| // with the media element.
|
| // (All 3 steps handled as needed in Chromium.)
|
| - std::unique_ptr<SuccessCallback> successCallback = bind(&SetMediaKeysHandler::setNewMediaKeys, wrapPersistent(this));
|
| - std::unique_ptr<FailureCallback> failureCallback = bind(&SetMediaKeysHandler::clearFailed, wrapPersistent(this));
|
| + std::unique_ptr<SuccessCallback> successCallback = WTF::bind(&SetMediaKeysHandler::setNewMediaKeys, wrapPersistent(this));
|
| + std::unique_ptr<FailureCallback> failureCallback = WTF::bind(&SetMediaKeysHandler::clearFailed, wrapPersistent(this));
|
| ContentDecryptionModuleResult* result = new SetContentDecryptionModuleResult(std::move(successCallback), std::move(failureCallback));
|
| mediaPlayer->setContentDecryptionModule(nullptr, result->result());
|
|
|
| @@ -196,8 +196,8 @@ void SetMediaKeysHandler::setNewMediaKeys()
|
| // algorithm on the media element.
|
| // (Handled in Chromium).
|
| if (m_element->webMediaPlayer()) {
|
| - std::unique_ptr<SuccessCallback> successCallback = bind(&SetMediaKeysHandler::finish, wrapPersistent(this));
|
| - std::unique_ptr<FailureCallback> failureCallback = bind(&SetMediaKeysHandler::setFailed, wrapPersistent(this));
|
| + std::unique_ptr<SuccessCallback> successCallback = WTF::bind(&SetMediaKeysHandler::finish, wrapPersistent(this));
|
| + std::unique_ptr<FailureCallback> failureCallback = WTF::bind(&SetMediaKeysHandler::setFailed, wrapPersistent(this));
|
| ContentDecryptionModuleResult* result = new SetContentDecryptionModuleResult(std::move(successCallback), std::move(failureCallback));
|
| m_element->webMediaPlayer()->setContentDecryptionModule(m_newMediaKeys->contentDecryptionModule(), result->result());
|
|
|
|
|