diff options
| author | raymes@google.com <raymes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 04:25:09 +0000 |
|---|---|---|
| committer | raymes@google.com <raymes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 04:25:09 +0000 |
| commit | 6012e392f3788dc751f9685e6c8f6b4fd98cb441 (patch) | |
| tree | 5188b154e27e96f0135d5d045221fa5a7a695c87 | |
| parent | 91dd32e5c6115d15f10e8f5560c40fd98973e1a6 (diff) | |
| download | chromium_src-6012e392f3788dc751f9685e6c8f6b4fd98cb441.zip chromium_src-6012e392f3788dc751f9685e6c8f6b4fd98cb441.tar.gz chromium_src-6012e392f3788dc751f9685e6c8f6b4fd98cb441.tar.bz2 | |
Pepper API: Removed PPB_Flash_DeviceID version 1.1.
This version was private and already deprecated, so is safe to remove.
This fixes an inconsistency between the generated header files and the IDL.
BUG=269307
R=dmichael@chromium.org, raymes@chromium.org, yzshen@chromium.org
Review URL: https://codereview.chromium.org/22331006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216574 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/api/private/ppb_flash_device_id.idl | 5 | ||||
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ppapi/api/private/ppb_flash_device_id.idl b/ppapi/api/private/ppb_flash_device_id.idl index 16b0d3d..b4ba3ca 100644 --- a/ppapi/api/private/ppb_flash_device_id.idl +++ b/ppapi/api/private/ppb_flash_device_id.idl @@ -8,8 +8,7 @@ */ label Chrome { - M21 = 1.0, - M29 = 1.1 + M21 = 1.0 }; // TODO(raymes): This is deprecated by the PPB_Flash_DRM interface. Remove this @@ -22,7 +21,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] + [version=1.0] int32_t GetDeviceID([in] PP_Resource device_id, [out] PP_Var id, [in] PP_CompletionCallback callback); diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c index aa68044..8bb17f7 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c @@ -2699,8 +2699,6 @@ static int32_t Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID(PP_Resource device_id, s /* End wrapper methods for PPB_Flash_DeviceID_1_0 */ -/* Not generating wrapper methods for PPB_Flash_DeviceID_1_1 */ - /* Begin wrapper methods for PPB_Flash_DRM_1_0 */ static PP_Resource Pnacl_M29_PPB_Flash_DRM_Create(PP_Instance instance) { @@ -4616,8 +4614,6 @@ struct PPB_Flash_DeviceID_1_0 Pnacl_Wrappers_PPB_Flash_DeviceID_1_0 = { .GetDeviceID = (int32_t (*)(PP_Resource device_id, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID }; -/* Not generating wrapper interface for PPB_Flash_DeviceID_1_1 */ - struct PPB_Flash_DRM_1_0 Pnacl_Wrappers_PPB_Flash_DRM_1_0 = { .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M29_PPB_Flash_DRM_Create, .GetDeviceID = (int32_t (*)(PP_Resource drm, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Flash_DRM_GetDeviceID, |