Commit c0debd58 authored by Wez's avatar Wez Committed by Commit Bot

Remove unused PPB_Flash_DRM:1.0 and PPB_Flash_DeviceID interfaces.

These interfaces have not been used by Flash for a long time now.

Change-Id: I53116e30145d7f322d2e27960b7b507691e75694
Reviewed-on: https://chromium-review.googlesource.com/1162585Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarRaymes Khoury <raymes@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584765}
parent 3835e3bf
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
#include "ppapi/c/private/ppb_find_private.h" #include "ppapi/c/private/ppb_find_private.h"
#include "ppapi/c/private/ppb_flash.h" #include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_drm.h"
#include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/c/private/ppb_flash_file.h"
#include "ppapi/c/private/ppb_flash_font_file.h" #include "ppapi/c/private/ppb_flash_font_file.h"
......
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
#include "ppapi/c/private/ppb_find_private.h" #include "ppapi/c/private/ppb_find_private.h"
#include "ppapi/c/private/ppb_flash.h" #include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_drm.h"
#include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/c/private/ppb_flash_file.h"
#include "ppapi/c/private/ppb_flash_font_file.h" #include "ppapi/c/private/ppb_flash_font_file.h"
......
/* 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_DeviceID</code> interface.
*/
label Chrome {
M21 = 1.0
};
// 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);
/**
* 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.
*/
[version=1.0]
int32_t GetDeviceID([in] PP_Resource device_id,
[out] PP_Var id,
[in] PP_CompletionCallback callback);
};
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
[generate_thunk] [generate_thunk]
label Chrome { label Chrome {
M29 = 1.0,
M33 = 1.1 M33 = 1.1
}; };
......
...@@ -125,7 +125,6 @@ source_set("c") { ...@@ -125,7 +125,6 @@ source_set("c") {
"private/ppb_find_private.h", "private/ppb_find_private.h",
"private/ppb_flash.h", "private/ppb_flash.h",
"private/ppb_flash_clipboard.h", "private/ppb_flash_clipboard.h",
"private/ppb_flash_device_id.h",
"private/ppb_flash_drm.h", "private/ppb_flash_drm.h",
"private/ppb_flash_file.h", "private/ppb_flash_file.h",
"private/ppb_flash_font_file.h", "private/ppb_flash_font_file.h",
......
/* 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_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_
#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_DEVICEID_INTERFACE_1_0 "PPB_Flash_DeviceID;1.0"
#define PPB_FLASH_DEVICEID_INTERFACE PPB_FLASH_DEVICEID_INTERFACE_1_0
/**
* @file
* This file contains the <code>PPB_Flash_DeviceID</code> interface.
*/
/**
* @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);
/**
* 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 device_id,
struct PP_Var* id,
struct PP_CompletionCallback callback);
};
typedef struct PPB_Flash_DeviceID_1_0 PPB_Flash_DeviceID;
/**
* @}
*/
#endif /* PPAPI_C_PRIVATE_PPB_FLASH_DEVICE_ID_H_ */
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* found in the LICENSE file. * found in the LICENSE file.
*/ */
/* From private/ppb_flash_drm.idl modified Mon Nov 11 14:49:53 2013. */ /* From private/ppb_flash_drm.idl modified Fri Aug 3 10:01:34 2018. */
#ifndef PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_
#define PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_stdint.h"
#include "ppapi/c/pp_var.h" #include "ppapi/c/pp_var.h"
#define PPB_FLASH_DRM_INTERFACE_1_0 "PPB_Flash_DRM;1.0"
#define PPB_FLASH_DRM_INTERFACE_1_1 "PPB_Flash_DRM;1.1" #define PPB_FLASH_DRM_INTERFACE_1_1 "PPB_Flash_DRM;1.1"
#define PPB_FLASH_DRM_INTERFACE PPB_FLASH_DRM_INTERFACE_1_1 #define PPB_FLASH_DRM_INTERFACE PPB_FLASH_DRM_INTERFACE_1_1
...@@ -74,17 +73,6 @@ struct PPB_Flash_DRM_1_1 { ...@@ -74,17 +73,6 @@ struct PPB_Flash_DRM_1_1 {
}; };
typedef struct PPB_Flash_DRM_1_1 PPB_Flash_DRM; typedef struct PPB_Flash_DRM_1_1 PPB_Flash_DRM;
struct PPB_Flash_DRM_1_0 {
PP_Resource (*Create)(PP_Instance instance);
int32_t (*GetDeviceID)(PP_Resource drm,
struct PP_Var* id,
struct PP_CompletionCallback callback);
PP_Bool (*GetHmonitor)(PP_Resource drm, int64_t* hmonitor);
int32_t (*GetVoucherFile)(PP_Resource drm,
PP_Resource* file_ref,
struct PP_CompletionCallback callback);
};
/** /**
* @} * @}
*/ */
......
...@@ -216,8 +216,6 @@ source_set("objects") { ...@@ -216,8 +216,6 @@ source_set("objects") {
"private/flash.h", "private/flash.h",
"private/flash_clipboard.cc", "private/flash_clipboard.cc",
"private/flash_clipboard.h", "private/flash_clipboard.h",
"private/flash_device_id.cc",
"private/flash_device_id.h",
"private/flash_drm.cc", "private/flash_drm.cc",
"private/flash_drm.h", "private/flash_drm.h",
"private/flash_file.cc", "private/flash_file.cc",
......
// 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.
#include "ppapi/cpp/private/flash_device_id.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/cpp/module_impl.h"
namespace pp {
namespace {
template <> const char* interface_name<PPB_Flash_DeviceID_1_0>() {
return PPB_FLASH_DEVICEID_INTERFACE_1_0;
}
} // namespace
namespace flash {
DeviceID::DeviceID() {
}
DeviceID::DeviceID(const InstanceHandle& instance) : Resource() {
if (has_interface<PPB_Flash_DeviceID_1_0>()) {
PassRefFromConstructor(get_interface<PPB_Flash_DeviceID_1_0>()->Create(
instance.pp_instance()));
}
}
int32_t DeviceID::GetDeviceID(
const CompletionCallbackWithOutput<Var>& callback) {
if (has_interface<PPB_Flash_DeviceID_1_0>()) {
return get_interface<PPB_Flash_DeviceID_1_0>()->GetDeviceID(
pp_resource(),
callback.output(),
callback.pp_completion_callback());
}
return callback.MayForce(PP_ERROR_NOINTERFACE);
}
} // namespace flash
} // namespace pp
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "ppapi/cpp/private/flash_drm.h" #include "ppapi/cpp/private/flash_drm.h"
#include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_drm.h"
#include "ppapi/cpp/module_impl.h" #include "ppapi/cpp/module_impl.h"
...@@ -13,18 +12,10 @@ namespace pp { ...@@ -13,18 +12,10 @@ namespace pp {
namespace { namespace {
template <> const char* interface_name<PPB_Flash_DRM_1_0>() {
return PPB_FLASH_DRM_INTERFACE_1_0;
}
template <> const char* interface_name<PPB_Flash_DRM_1_1>() { template <> const char* interface_name<PPB_Flash_DRM_1_1>() {
return PPB_FLASH_DRM_INTERFACE_1_1; return PPB_FLASH_DRM_INTERFACE_1_1;
} }
template <> const char* interface_name<PPB_Flash_DeviceID_1_0>() {
return PPB_FLASH_DEVICEID_INTERFACE_1_0;
}
} // namespace } // namespace
namespace flash { namespace flash {
...@@ -36,12 +27,6 @@ DRM::DRM(const InstanceHandle& instance) : Resource() { ...@@ -36,12 +27,6 @@ DRM::DRM(const InstanceHandle& instance) : Resource() {
if (has_interface<PPB_Flash_DRM_1_1>()) { if (has_interface<PPB_Flash_DRM_1_1>()) {
PassRefFromConstructor(get_interface<PPB_Flash_DRM_1_1>()->Create( PassRefFromConstructor(get_interface<PPB_Flash_DRM_1_1>()->Create(
instance.pp_instance())); instance.pp_instance()));
} else if (has_interface<PPB_Flash_DRM_1_0>()) {
PassRefFromConstructor(get_interface<PPB_Flash_DRM_1_0>()->Create(
instance.pp_instance()));
} else if (has_interface<PPB_Flash_DeviceID_1_0>()) {
PassRefFromConstructor(get_interface<PPB_Flash_DeviceID_1_0>()->Create(
instance.pp_instance()));
} }
} }
...@@ -52,18 +37,6 @@ int32_t DRM::GetDeviceID(const CompletionCallbackWithOutput<Var>& callback) { ...@@ -52,18 +37,6 @@ int32_t DRM::GetDeviceID(const CompletionCallbackWithOutput<Var>& callback) {
callback.output(), callback.output(),
callback.pp_completion_callback()); callback.pp_completion_callback());
} }
if (has_interface<PPB_Flash_DRM_1_0>()) {
return get_interface<PPB_Flash_DRM_1_0>()->GetDeviceID(
pp_resource(),
callback.output(),
callback.pp_completion_callback());
}
if (has_interface<PPB_Flash_DeviceID_1_0>()) {
return get_interface<PPB_Flash_DeviceID_1_0>()->GetDeviceID(
pp_resource(),
callback.output(),
callback.pp_completion_callback());
}
return callback.MayForce(PP_ERROR_NOINTERFACE); return callback.MayForce(PP_ERROR_NOINTERFACE);
} }
...@@ -73,11 +46,6 @@ bool DRM::GetHmonitor(int64_t* hmonitor) { ...@@ -73,11 +46,6 @@ bool DRM::GetHmonitor(int64_t* hmonitor) {
pp_resource(), pp_resource(),
hmonitor)); hmonitor));
} }
if (has_interface<PPB_Flash_DRM_1_0>()) {
return PP_ToBool(get_interface<PPB_Flash_DRM_1_0>()->GetHmonitor(
pp_resource(),
hmonitor));
}
return 0; return 0;
} }
...@@ -89,12 +57,6 @@ int32_t DRM::GetVoucherFile( ...@@ -89,12 +57,6 @@ int32_t DRM::GetVoucherFile(
callback.output(), callback.output(),
callback.pp_completion_callback()); callback.pp_completion_callback());
} }
if (has_interface<PPB_Flash_DRM_1_0>()) {
return get_interface<PPB_Flash_DRM_1_0>()->GetVoucherFile(
pp_resource(),
callback.output(),
callback.pp_completion_callback());
}
return PP_ERROR_NOINTERFACE; return PP_ERROR_NOINTERFACE;
} }
......
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
#include "ppapi/c/private/ppb_file_ref_private.h" #include "ppapi/c/private/ppb_file_ref_private.h"
#include "ppapi/c/private/ppb_flash.h" #include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_drm.h"
#include "ppapi/c/private/ppb_flash_menu.h" #include "ppapi/c/private/ppb_flash_menu.h"
#include "ppapi/c/private/ppb_host_resolver_private.h" #include "ppapi/c/private/ppb_host_resolver_private.h"
...@@ -178,8 +177,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_13_0; ...@@ -178,8 +177,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_13_0;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_0;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_1;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Menu_0_2; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Menu_0_2;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1;
...@@ -3715,44 +3712,6 @@ static PP_Bool Pnacl_M34_PPB_Flash_Clipboard_GetSequenceNumber(PP_Instance insta ...@@ -3715,44 +3712,6 @@ static PP_Bool Pnacl_M34_PPB_Flash_Clipboard_GetSequenceNumber(PP_Instance insta
/* End wrapper methods for PPB_Flash_Clipboard_5_1 */ /* End wrapper methods for PPB_Flash_Clipboard_5_1 */
/* Begin wrapper methods for PPB_Flash_DeviceID_1_0 */
static PP_Resource Pnacl_M21_PPB_Flash_DeviceID_Create(PP_Instance instance) {
const struct PPB_Flash_DeviceID_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0.real_iface;
return iface->Create(instance);
}
static int32_t Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID(PP_Resource device_id, struct PP_Var* id, struct PP_CompletionCallback* callback) {
const struct PPB_Flash_DeviceID_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0.real_iface;
return iface->GetDeviceID(device_id, id, *callback);
}
/* End wrapper methods for PPB_Flash_DeviceID_1_0 */
/* Begin wrapper methods for PPB_Flash_DRM_1_0 */
static PP_Resource Pnacl_M29_PPB_Flash_DRM_Create(PP_Instance instance) {
const struct PPB_Flash_DRM_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DRM_1_0.real_iface;
return iface->Create(instance);
}
static int32_t Pnacl_M29_PPB_Flash_DRM_GetDeviceID(PP_Resource drm, struct PP_Var* id, struct PP_CompletionCallback* callback) {
const struct PPB_Flash_DRM_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DRM_1_0.real_iface;
return iface->GetDeviceID(drm, id, *callback);
}
static PP_Bool Pnacl_M29_PPB_Flash_DRM_GetHmonitor(PP_Resource drm, int64_t* hmonitor) {
const struct PPB_Flash_DRM_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DRM_1_0.real_iface;
return iface->GetHmonitor(drm, hmonitor);
}
static int32_t Pnacl_M29_PPB_Flash_DRM_GetVoucherFile(PP_Resource drm, PP_Resource* file_ref, struct PP_CompletionCallback* callback) {
const struct PPB_Flash_DRM_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DRM_1_0.real_iface;
return iface->GetVoucherFile(drm, file_ref, *callback);
}
/* End wrapper methods for PPB_Flash_DRM_1_0 */
/* Begin wrapper methods for PPB_Flash_DRM_1_1 */ /* Begin wrapper methods for PPB_Flash_DRM_1_1 */
static PP_Resource Pnacl_M33_PPB_Flash_DRM_Create(PP_Instance instance) { static PP_Resource Pnacl_M33_PPB_Flash_DRM_Create(PP_Instance instance) {
...@@ -5558,18 +5517,6 @@ static const struct PPB_Flash_Clipboard_5_1 Pnacl_Wrappers_PPB_Flash_Clipboard_5 ...@@ -5558,18 +5517,6 @@ static const struct PPB_Flash_Clipboard_5_1 Pnacl_Wrappers_PPB_Flash_Clipboard_5
.GetSequenceNumber = (PP_Bool (*)(PP_Instance instance_id, PP_Flash_Clipboard_Type clipboard_type, uint64_t* sequence_number))&Pnacl_M34_PPB_Flash_Clipboard_GetSequenceNumber .GetSequenceNumber = (PP_Bool (*)(PP_Instance instance_id, PP_Flash_Clipboard_Type clipboard_type, uint64_t* sequence_number))&Pnacl_M34_PPB_Flash_Clipboard_GetSequenceNumber
}; };
static const struct PPB_Flash_DeviceID_1_0 Pnacl_Wrappers_PPB_Flash_DeviceID_1_0 = {
.Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M21_PPB_Flash_DeviceID_Create,
.GetDeviceID = (int32_t (*)(PP_Resource device_id, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID
};
static const 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,
.GetHmonitor = (PP_Bool (*)(PP_Resource drm, int64_t* hmonitor))&Pnacl_M29_PPB_Flash_DRM_GetHmonitor,
.GetVoucherFile = (int32_t (*)(PP_Resource drm, PP_Resource* file_ref, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Flash_DRM_GetVoucherFile
};
static const struct PPB_Flash_DRM_1_1 Pnacl_Wrappers_PPB_Flash_DRM_1_1 = { static const struct PPB_Flash_DRM_1_1 Pnacl_Wrappers_PPB_Flash_DRM_1_1 = {
.Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M33_PPB_Flash_DRM_Create, .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M33_PPB_Flash_DRM_Create,
.GetDeviceID = (int32_t (*)(PP_Resource drm, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M33_PPB_Flash_DRM_GetDeviceID, .GetDeviceID = (int32_t (*)(PP_Resource drm, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M33_PPB_Flash_DRM_GetDeviceID,
...@@ -6321,18 +6268,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1 = { ...@@ -6321,18 +6268,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1 = {
.real_iface = NULL .real_iface = NULL
}; };
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0 = {
.iface_macro = PPB_FLASH_DEVICEID_INTERFACE_1_0,
.wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Flash_DeviceID_1_0,
.real_iface = NULL
};
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_0 = {
.iface_macro = PPB_FLASH_DRM_INTERFACE_1_0,
.wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Flash_DRM_1_0,
.real_iface = NULL
};
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_1 = { static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_1 = {
.iface_macro = PPB_FLASH_DRM_INTERFACE_1_1, .iface_macro = PPB_FLASH_DRM_INTERFACE_1_1,
.wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Flash_DRM_1_1, .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Flash_DRM_1_1,
...@@ -6552,8 +6487,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { ...@@ -6552,8 +6487,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
&Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0, &Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0,
&Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0, &Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0,
&Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1, &Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1,
&Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0,
&Pnacl_WrapperInfo_PPB_Flash_DRM_1_0,
&Pnacl_WrapperInfo_PPB_Flash_DRM_1_1, &Pnacl_WrapperInfo_PPB_Flash_DRM_1_1,
&Pnacl_WrapperInfo_PPB_Flash_Menu_0_2, &Pnacl_WrapperInfo_PPB_Flash_Menu_0_2,
&Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1, &Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1,
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
#include "ppapi/c/private/ppb_find_private.h" #include "ppapi/c/private/ppb_find_private.h"
#include "ppapi/c/private/ppb_flash.h" #include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h" #include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_drm.h"
#include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/c/private/ppb_flash_file.h"
#include "ppapi/c/private/ppb_flash_font_file.h" #include "ppapi/c/private/ppb_flash_font_file.h"
......
...@@ -15,14 +15,12 @@ ...@@ -15,14 +15,12 @@
#include "ppapi/c/private/ppb_flash_drm.h" #include "ppapi/c/private/ppb_flash_drm.h"
#include "ppapi/cpp/instance.h" #include "ppapi/cpp/instance.h"
#include "ppapi/cpp/module.h" #include "ppapi/cpp/module.h"
#include "ppapi/cpp/private/flash_device_id.h"
#include "ppapi/cpp/private/flash_drm.h" #include "ppapi/cpp/private/flash_drm.h"
#include "ppapi/cpp/var.h" #include "ppapi/cpp/var.h"
#include "ppapi/tests/testing_instance.h" #include "ppapi/tests/testing_instance.h"
REGISTER_TEST_CASE(FlashDRM); REGISTER_TEST_CASE(FlashDRM);
using pp::flash::DeviceID;
using pp::flash::DRM; using pp::flash::DRM;
using pp::FileRef; using pp::FileRef;
using pp::PassRef; using pp::PassRef;
...@@ -61,21 +59,6 @@ void TestFlashDRM::RunTests(const std::string& filter) { ...@@ -61,21 +59,6 @@ void TestFlashDRM::RunTests(const std::string& filter) {
} }
std::string TestFlashDRM::TestGetDeviceID() { std::string TestFlashDRM::TestGetDeviceID() {
// Test the old C++ wrapper.
// TODO(raymes): Remove this once Flash switches APIs.
{
DeviceID device_id(instance_);
TestCompletionCallbackWithOutput<Var> output_callback(
instance_->pp_instance());
int32_t rv = device_id.GetDeviceID(output_callback.GetCallback());
output_callback.WaitForResult(rv);
ASSERT_TRUE(output_callback.result() == PP_OK);
Var result = output_callback.output();
ASSERT_TRUE(result.is_string());
std::string id = result.AsString();
ASSERT_FALSE(id.empty());
}
{ {
DRM drm(instance_); DRM drm(instance_);
TestCompletionCallbackWithOutput<Var> output_callback( TestCompletionCallbackWithOutput<Var> output_callback(
......
...@@ -167,7 +167,6 @@ source_set("thunk") { ...@@ -167,7 +167,6 @@ source_set("thunk") {
"ppb_buffer_thunk.cc", "ppb_buffer_thunk.cc",
"ppb_char_set_thunk.cc", "ppb_char_set_thunk.cc",
"ppb_flash_clipboard_thunk.cc", "ppb_flash_clipboard_thunk.cc",
"ppb_flash_device_id_thunk.cc",
"ppb_flash_drm_thunk.cc", "ppb_flash_drm_thunk.cc",
"ppb_flash_file_fileref_thunk.cc", "ppb_flash_file_fileref_thunk.cc",
"ppb_flash_file_modulelocal_thunk.cc", "ppb_flash_file_modulelocal_thunk.cc",
......
...@@ -28,10 +28,6 @@ PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_0, ...@@ -28,10 +28,6 @@ PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_0,
PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_1, PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_1,
PPB_Flash_Clipboard_5_1) PPB_Flash_Clipboard_5_1)
PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0,
PPB_Flash_DeviceID_1_0)
PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_0,
PPB_Flash_DRM_1_0)
PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_1, PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_1,
PPB_Flash_DRM_1_1) PPB_Flash_DRM_1_1)
......
// 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_device_id.idl modified Thu Dec 20 13:10:26 2012.
#include <stdint.h>
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_flash_device_id.h"
#include "ppapi/shared_impl/tracked_callback.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_flash_drm_api.h"
#include "ppapi/thunk/ppb_instance_api.h"
#include "ppapi/thunk/resource_creation_api.h"
#include "ppapi/thunk/thunk.h"
namespace ppapi {
namespace thunk {
namespace {
PP_Resource Create(PP_Instance instance) {
VLOG(4) << "PPB_Flash_DeviceID::Create()";
EnterResourceCreation enter(instance);
if (enter.failed())
return 0;
return enter.functions()->CreateFlashDRM(instance);
}
int32_t GetDeviceID(PP_Resource device_id,
struct PP_Var* id,
struct PP_CompletionCallback callback) {
VLOG(4) << "PPB_Flash_DeviceID::GetDeviceID()";
EnterResource<PPB_Flash_DRM_API> enter(device_id, callback, true);
if (enter.failed())
return enter.retval();
return enter.SetResult(enter.object()->GetDeviceID(id, enter.callback()));
}
const PPB_Flash_DeviceID_1_0 g_ppb_flash_deviceid_thunk_1_0 = {
&Create,
&GetDeviceID
};
} // namespace
const PPB_Flash_DeviceID_1_0* GetPPB_Flash_DeviceID_1_0_Thunk() {
return &g_ppb_flash_deviceid_thunk_1_0;
}
} // namespace thunk
} // namespace ppapi
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// From private/ppb_flash_drm.idl modified Wed Jan 27 17:10:16 2016. // From private/ppb_flash_drm.idl modified Fri Aug 3 10:01:34 2018.
#include <stdint.h> #include <stdint.h>
...@@ -67,18 +67,11 @@ int32_t MonitorIsExternal(PP_Resource drm, ...@@ -67,18 +67,11 @@ int32_t MonitorIsExternal(PP_Resource drm,
enter.object()->MonitorIsExternal(is_external, enter.callback())); enter.object()->MonitorIsExternal(is_external, enter.callback()));
} }
const PPB_Flash_DRM_1_0 g_ppb_flash_drm_thunk_1_0 = {
&Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile};
const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = { const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = {
&Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile, &MonitorIsExternal}; &Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile, &MonitorIsExternal};
} // namespace } // namespace
PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() {
return &g_ppb_flash_drm_thunk_1_0;
}
PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() { PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() {
return &g_ppb_flash_drm_thunk_1_1; return &g_ppb_flash_drm_thunk_1_1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment