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

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

Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use ScopedVector 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/render_cdm_factory.h
diff --git a/content/renderer/media/crypto/render_cdm_factory.h b/content/renderer/media/crypto/render_cdm_factory.h
index f15bfe8a4f7704e8a786f48bfebbc0f1c20b531e..af2d7ad257991061bfd75300aa35e90ef73b746a 100644
--- a/content/renderer/media/crypto/render_cdm_factory.h
+++ b/content/renderer/media/crypto/render_cdm_factory.h
@@ -39,7 +39,8 @@ class RenderCdmFactory : public media::CdmFactory, public RenderFrameObserver {
~RenderCdmFactory() override;
- scoped_ptr<media::MediaKeys> Create(
+ // CdmFactory implementation.
+ void Create(
const std::string& key_system,
bool allow_distinctive_identifier,
bool allow_persistent_state,
@@ -48,8 +49,8 @@ class RenderCdmFactory : public media::CdmFactory, public RenderFrameObserver {
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)
- override;
+ const media::SessionExpirationUpdateCB& session_expiration_update_cb,
+ const CdmCreatedCB& cdm_created_cb) override;
private:
#if defined(ENABLE_PEPPER_CDMS)
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/crypto/render_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698