summaryrefslogtreecommitdiffstats
path: root/ppapi/c/private
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/c/private
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/c/private')
-rw-r--r--ppapi/c/private/ppb_flash_device_id.h4
-rw-r--r--ppapi/c/private/ppb_flash_drm.h57
2 files changed, 60 insertions, 1 deletions
diff --git a/ppapi/c/private/ppb_flash_device_id.h b/ppapi/c/private/ppb_flash_device_id.h
index 33d1ba7..17660fb 100644
--- a/ppapi/c/private/ppb_flash_device_id.h
+++ b/ppapi/c/private/ppb_flash_device_id.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From private/ppb_flash_device_id.idl modified Fri Jun 1 15:21:17 2012. */
+/* From private/ppb_flash_device_id.idl modified Tue May 14 10:55:27 2013. */
#ifndef PPAPI_C_PRIVATE_PPB_FLASH_DEVICE_ID_H_
#define PPAPI_C_PRIVATE_PPB_FLASH_DEVICE_ID_H_
@@ -29,6 +29,8 @@
* @addtogroup Interfaces
* @{
*/
+/* TODO(raymes): This is deprecated by the PPB_Flash_DRM interface. Remove this
+ * interface after a few versions of Chrome have passed. */
struct PPB_Flash_DeviceID_1_0 {
PP_Resource (*Create)(PP_Instance instance);
/**
diff --git a/ppapi/c/private/ppb_flash_drm.h b/ppapi/c/private/ppb_flash_drm.h
new file mode 100644
index 0000000..ed41593b
--- /dev/null
+++ b/ppapi/c/private/ppb_flash_drm.h
@@ -0,0 +1,57 @@
+/* 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.
+ */
+
+/* From private/ppb_flash_drm.idl modified Tue May 21 09:34:07 2013. */
+
+#ifndef PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_
+#define PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_
+
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_completion_callback.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_macros.h"
+#include "ppapi/c/pp_resource.h"
+#include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/pp_var.h"
+
+#define PPB_FLASH_DRM_INTERFACE_1_0 "PPB_Flash_DRM;1.0"
+#define PPB_FLASH_DRM_INTERFACE PPB_FLASH_DRM_INTERFACE_1_0
+
+/**
+ * @file
+ * This file contains the <code>PPB_Flash_DRM</code> interface.
+ */
+
+
+/**
+ * @addtogroup Interfaces
+ * @{
+ */
+/**
+ * A resource for performing Flash DRM-related operations.
+ */
+struct PPB_Flash_DRM_1_0 {
+ /**
+ * Creates a PPB_Flash_DRM resource for performing DRM-related operations in
+ * Flash.
+ */
+ PP_Resource (*Create)(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)(PP_Resource drm,
+ struct PP_Var* id,
+ struct PP_CompletionCallback callback);
+};
+
+typedef struct PPB_Flash_DRM_1_0 PPB_Flash_DRM;
+/**
+ * @}
+ */
+
+#endif /* PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_ */
+