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);
+};
+