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

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

Issue 379343003: Set callback interface on WebCDMSession after creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 months 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 | « no previous file | public/platform/WebContentDecryptionModule.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/MediaKeySession.cpp
diff --git a/Source/modules/encryptedmedia/MediaKeySession.cpp b/Source/modules/encryptedmedia/MediaKeySession.cpp
index 11bf85103dbdc094e385de86c42442f42fd56c9e..cfe1ba88c1888cbd52052271cff141d141c90a03 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -71,14 +71,14 @@ MediaKeySession::MediaKeySession(ExecutionContext* context, blink::WebContentDec
: ActiveDOMObject(context)
, m_keySystem(keys->keySystem())
, m_asyncEventQueue(GenericEventQueue::create(this))
- , m_session(adoptPtr(cdm->createSession(this)))
+ , m_session(adoptPtr(cdm->createSession()))
, m_keys(keys)
, m_isClosed(false)
, m_actionTimer(this, &MediaKeySession::actionTimerFired)
{
WTF_LOG(Media, "MediaKeySession::MediaKeySession");
ScriptWrappable::init(this);
- ASSERT(m_session);
+ m_session->setClientInterface(this);
ddorwin 2014/07/10 23:22:30 The point of this change is to allow refactoring.
jrummell 2014/07/11 00:55:53 Without promises implemented, all responses come b
}
MediaKeySession::~MediaKeySession()
« no previous file with comments | « no previous file | public/platform/WebContentDecryptionModule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698