summaryrefslogtreecommitdiffstats
path: root/ppapi/api
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 14:30:55 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 14:30:55 +0000
commit1c081e5727bbb538bf50bb1b10e96fd17d78b728 (patch)
treede655c781f349ca82bdd2d8761fcc97bfd0e230e /ppapi/api
parent8b8da41b39c9c7699ab7b63090a5c4b3ba2e41ed (diff)
downloadchromium_src-1c081e5727bbb538bf50bb1b10e96fd17d78b728.zip
chromium_src-1c081e5727bbb538bf50bb1b10e96fd17d78b728.tar.gz
chromium_src-1c081e5727bbb538bf50bb1b10e96fd17d78b728.tar.bz2
Rename PPB_Flash_DeviceID interface to PPB_Flash_DRM
This is mainly a mechanical change to rename PPB_Flash_DeviceID to PPB_Flash_DRM. It deprecates the old interface. The reason is that we will be adding more DRM-related APIs and it makes sense to put them into a single interface. BUG=242241 TBR=brettw for chrome_browser.gypi Review URL: https://chromiumcodereview.appspot.com/15491006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/api')
-rw-r--r--ppapi/api/private/ppb_flash_device_id.idl8
-rw-r--r--ppapi/api/private/ppb_flash_drm.idl35
2 files changed, 40 insertions, 3 deletions
diff --git a/ppapi/api/private/ppb_flash_device_id.idl b/ppapi/api/private/ppb_flash_device_id.idl
index 1fa4986..16b0d3d 100644
--- a/ppapi/api/private/ppb_flash_device_id.idl
+++ b/ppapi/api/private/ppb_flash_device_id.idl
@@ -7,12 +7,13 @@
* This file contains the <code>PPB_Flash_DeviceID</code> interface.
*/
-[generate_thunk]
-
label Chrome {
- M21 = 1.0
+ M21 = 1.0,
+ M29 = 1.1
};
+// TODO(raymes): This is deprecated by the PPB_Flash_DRM interface. Remove this
+// interface after a few versions of Chrome have passed.
interface PPB_Flash_DeviceID {
PP_Resource Create([in] PP_Instance instance);
@@ -21,6 +22,7 @@ interface PPB_Flash_DeviceID {
* string in |*id| and will call the completion callback. On failure the
* given var will be PP_VARTYPE_UNDEFINED.
*/
+ [version=1.0, deprecate=1.1]
int32_t GetDeviceID([in] PP_Resource device_id,
[out] PP_Var id,
[in] PP_CompletionCallback callback);
diff --git a/ppapi/api/private/ppb_flash_drm.idl b/ppapi/api/private/ppb_flash_drm.idl
new file mode 100644
index 0000000..8438114
--- /dev/null
+++ b/ppapi/api/private/ppb_flash_drm.idl
@@ -0,0 +1,35 @@
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**
+ * This file contains the <code>PPB_Flash_DRM</code> interface.
+ */
+
+[generate_thunk]
+
+label Chrome {
+ M29 = 1.0
+};
+
+/**
+ * A resource for performing Flash DRM-related operations.
+ */
+interface PPB_Flash_DRM {
+ /**
+ * Creates a PPB_Flash_DRM resource for performing DRM-related operations in
+ * Flash.
+ */
+ PP_Resource Create([in] PP_Instance instance);
+
+ /**
+ * Asynchronously computes the device ID. When available, it will place the
+ * string in |*id| and will call the completion callback. On failure the
+ * given var will be PP_VARTYPE_UNDEFINED.
+ */
+ int32_t GetDeviceID([in] PP_Resource drm,
+ [out] PP_Var id,
+ [in] PP_CompletionCallback callback);
+};
+