diff options
| author | jrummell <jrummell@chromium.org> | 2015-05-05 15:27:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 22:28:05 +0000 |
| commit | 87a2db5daf3fbada56114caa4bb61e596ad459a2 (patch) | |
| tree | fad907e44626d8cb3bd9938d16da66995e29f16a /content/content_renderer.gypi | |
| parent | f7b39b78d4e052cd57fe9a277e578c4078c7ce5f (diff) | |
| download | chromium_src-87a2db5daf3fbada56114caa4bb61e596ad459a2.zip chromium_src-87a2db5daf3fbada56114caa4bb61e596ad459a2.tar.gz chromium_src-87a2db5daf3fbada56114caa4bb61e596ad459a2.tar.bz2 | |
Initialize the CDM asynchronously
Currently initialization happens asynchronously, but as Initialize()
has no way to report success/failure, subsequent calls need to check
that it succeeded. This change passes a promise to Initialize() so
that the CDM can report success/failure properly.
BUG=407435,469003
TEST=EME tests pass
Review URL: https://codereview.chromium.org/1102363005
Cr-Commit-Position: refs/heads/master@{#328418}
Diffstat (limited to 'content/content_renderer.gypi')
| -rw-r--r-- | content/content_renderer.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index b4afefe..2f65b7a 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -262,6 +262,8 @@ 'renderer/media/audio_message_filter.h', 'renderer/media/audio_renderer_mixer_manager.cc', 'renderer/media/audio_renderer_mixer_manager.h', + 'renderer/media/crypto/cdm_initialized_promise.cc', + 'renderer/media/crypto/cdm_initialized_promise.h', 'renderer/media/crypto/pepper_cdm_wrapper.h', 'renderer/media/crypto/pepper_cdm_wrapper_impl.cc', 'renderer/media/crypto/pepper_cdm_wrapper_impl.h', |