Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 705003002: Change the return type of WTF::bind() to |OwnPtr<Function>| (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reflect comments from yhirano Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/workers/WorkerThread.cpp ('k') | Source/modules/filesystem/LocalFileSystem.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
diff --git a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
index eea6c5f494cbb094d39f8159d55b6b7b4bb30ea8..7f8ad425f46afe4581a86394d81de6013744730f 100644
--- a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
+++ b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
@@ -77,7 +77,7 @@ typedef Function<void(ExceptionCode, const String&)> FailureCallback;
// Calls |success| if result is resolved, |failure| is result is rejected.
class SetContentDecryptionModuleResult final : public ContentDecryptionModuleResult {
public:
- SetContentDecryptionModuleResult(SuccessCallback success, FailureCallback failure)
+ SetContentDecryptionModuleResult(PassOwnPtr<SuccessCallback> success, PassOwnPtr<FailureCallback> failure)
: m_successCallback(success)
, m_failureCallback(failure)
{
@@ -86,23 +86,23 @@ public:
// ContentDecryptionModuleResult implementation.
virtual void complete() override
{
- m_successCallback();
+ (*m_successCallback)();
}
virtual void completeWithSession(blink::WebContentDecryptionModuleResult::SessionStatus status) override
{
ASSERT_NOT_REACHED();
- m_failureCallback(InvalidStateError, "Unexpected completion.");
+ (*m_failureCallback)(InvalidStateError, "Unexpected completion.");
}
virtual void completeWithError(blink::WebContentDecryptionModuleException code, unsigned long systemCode, const blink::WebString& message) override
{
- m_failureCallback(WebCdmExceptionToExceptionCode(code), message);
+ (*m_failureCallback)(WebCdmExceptionToExceptionCode(code), message);
}
private:
- SuccessCallback m_successCallback;
- FailureCallback m_failureCallback;
+ OwnPtr<SuccessCallback> m_successCallback;
+ OwnPtr<FailureCallback> m_failureCallback;
};
ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
@@ -188,9 +188,9 @@ void SetMediaKeysHandler::setNewMediaKeys()
// sessions).
// (Handled in Chromium).
if (m_element->webMediaPlayer()) {
- SuccessCallback successCallback = bind(&SetMediaKeysHandler::finish, this);
- FailureCallback failureCallback = bind<ExceptionCode, const String&>(&SetMediaKeysHandler::reportSetFailed, this);
- ContentDecryptionModuleResult* result = new SetContentDecryptionModuleResult(successCallback, failureCallback);
+ OwnPtr<SuccessCallback> successCallback = bind(&SetMediaKeysHandler::finish, this);
+ OwnPtr<FailureCallback> failureCallback = bind<ExceptionCode, const String&>(&SetMediaKeysHandler::reportSetFailed, this);
+ ContentDecryptionModuleResult* result = new SetContentDecryptionModuleResult(successCallback.release(), failureCallback.release());
m_element->webMediaPlayer()->setContentDecryptionModule(m_newMediaKeys->contentDecryptionModule(), result->result());
// Don't do anything more until |result| is resolved (or rejected).
« no previous file with comments | « Source/core/workers/WorkerThread.cpp ('k') | Source/modules/filesystem/LocalFileSystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698