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

Unified Diff: content/renderer/media/crypto/proxy_media_keys.h

Issue 1102363005: Initialize the CDM asynchronously (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create() changes Created 5 years, 8 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
Index: content/renderer/media/crypto/proxy_media_keys.h
diff --git a/content/renderer/media/crypto/proxy_media_keys.h b/content/renderer/media/crypto/proxy_media_keys.h
index 979de0a94ea4200944b6b34b6d7a847570bdf584..e7fadf5ea37abf1c469df5599398426abb089c23 100644
--- a/content/renderer/media/crypto/proxy_media_keys.h
+++ b/content/renderer/media/crypto/proxy_media_keys.h
@@ -34,7 +34,8 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
const media::SessionClosedCB& session_closed_cb,
const media::LegacySessionErrorCB& legacy_session_error_cb,
const media::SessionKeysChangeCB& session_keys_change_cb,
- const media::SessionExpirationUpdateCB& session_expiration_update_cb);
+ const media::SessionExpirationUpdateCB& session_expiration_update_cb,
+ const media::CdmCreatedCB& cdm_created_cb);
~ProxyMediaKeys() override;
@@ -97,7 +98,8 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
const media::SessionExpirationUpdateCB& session_expiration_update_cb);
void InitializeCdm(const std::string& key_system,
- const GURL& security_origin);
+ const GURL& security_origin,
+ scoped_ptr<media::SimpleCdmPromise> promise);
RendererCdmManager* manager_;
int cdm_id_;

Powered by Google App Engine
This is Rietveld 408576698