diff options
| author | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:54:25 +0000 |
|---|---|---|
| committer | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:54:25 +0000 |
| commit | 0dbea5feff930c613725b56c11ab9663bfe949c5 (patch) | |
| tree | bfbe08b3d3cfa12e6ce402b83c986f5a41c7033b /media/media.gyp | |
| parent | c29f10f1305b954d7629a05cf1cc59e56b482cf1 (diff) | |
| download | chromium_src-0dbea5feff930c613725b56c11ab9663bfe949c5.zip chromium_src-0dbea5feff930c613725b56c11ab9663bfe949c5.tar.gz chromium_src-0dbea5feff930c613725b56c11ab9663bfe949c5.tar.bz2 | |
Add Promises for EME (Chromium side)
Now that the EME-WD spec has changed to specify promises, implement
them on the Chromium side. They currently get converted back to
events before passing them to blink:: until the blink interface gets
changed.
Additional changes in this CL:
1. Pass a reference to the promise though PPAPI.
2. Roll DEPS for CDM.h to include CDM_5.
3. Update cdm_adapter to use CDM_5 (in addition to existing CDM_4).
4. Change External Clear Key to use CDM_5.
5. Since CDM_5 references sessions by the actual session id (a string,
web_session_id), switch to using it rather than the previously used
session_id (which is an integer, and used as a reference).
BUG=358271
TEST=all existing encrypted media layout and browser tests pass
Review URL: https://codereview.chromium.org/265993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index bbded6f..bd6f659 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -252,6 +252,8 @@ 'base/buffers.h', 'base/byte_queue.cc', 'base/byte_queue.h', + 'base/cdm_promise.cc', + 'base/cdm_promise.h', 'base/channel_mixer.cc', 'base/channel_mixer.h', 'base/clock.cc', |