summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-07 08:54:25 +0000
committerjrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-07 08:54:25 +0000
commit0dbea5feff930c613725b56c11ab9663bfe949c5 (patch)
treebfbe08b3d3cfa12e6ce402b83c986f5a41c7033b /tools
parentc29f10f1305b954d7629a05cf1cc59e56b482cf1 (diff)
downloadchromium_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 'tools')
-rw-r--r--tools/metrics/histograms/histograms.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index de5d7d1..21a0f46 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -41146,6 +41146,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
<int value="62905097" label="PPB_TrueTypeFont(Dev);0.1"/>
<int value="79708274" label="PPB_TCPSocket;1.1"/>
<int value="110360074" label="PPB_Var;1.1"/>
+ <int value="126651696" label="PPB_ContentDecryptor_Private;0.12"/>
<int value="138418890" label="PPB_Memory(Dev);0.1"/>
<int value="153443470" label="PPB_URLResponseInfo;1.0"/>
<int value="153532707" label="PPB_Buffer(Dev);0.4"/>