Skip to content

Commit

Permalink
Remove unused PPB_Flash_DRM:1.0 and PPB_Flash_DeviceID interfaces.
Browse files Browse the repository at this point in the history 
These interfaces have not been used by Flash for a long time now.

Change-Id: I53116e30145d7f322d2e27960b7b507691e75694
Reviewed-on: https://chromium-review.googlesource.com/1162585
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584765}
  • Loading branch information
Wez authored and Commit Bot committed Aug 21, 2018
1 parent 3835e3b commit c0debd5
Show file tree
Hide file tree
Showing 17 changed files with 2 additions and 335 deletions.
1 change: 0 additions & 1 deletion chrome/common/ppapi_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
#include "ppapi/c/private/ppb_find_private.h"
#include "ppapi/c/private/ppb_flash.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_file.h"
#include "ppapi/c/private/ppb_flash_font_file.h"
Expand Down
1 change: 0 additions & 1 deletion content/renderer/pepper/plugin_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
#include "ppapi/c/private/ppb_find_private.h"
#include "ppapi/c/private/ppb_flash.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_file.h"
#include "ppapi/c/private/ppb_flash_font_file.h"
Expand Down
29 changes: 0 additions & 29 deletions ppapi/api/private/ppb_flash_device_id.idl
View file

This file was deleted.

1 change: 0 additions & 1 deletion ppapi/api/private/ppb_flash_drm.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
[generate_thunk]

label Chrome {
M29 = 1.0,
M33 = 1.1
};

Expand Down
1 change: 0 additions & 1 deletion ppapi/c/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ source_set("c") {
"private/ppb_find_private.h",
"private/ppb_flash.h",
"private/ppb_flash_clipboard.h",
"private/ppb_flash_device_id.h",
"private/ppb_flash_drm.h",
"private/ppb_flash_file.h",
"private/ppb_flash_font_file.h",
Expand Down
52 changes: 0 additions & 52 deletions ppapi/c/private/ppb_flash_device_id.h
View file

This file was deleted.

14 changes: 1 addition & 13 deletions ppapi/c/private/ppb_flash_drm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_
#define PPAPI_C_PRIVATE_PPB_FLASH_DRM_H_
Expand All @@ -16,7 +16,6 @@
#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_1_1 "PPB_Flash_DRM;1.1"
#define PPB_FLASH_DRM_INTERFACE PPB_FLASH_DRM_INTERFACE_1_1

Expand Down Expand Up @@ -74,17 +73,6 @@ struct PPB_Flash_DRM_1_1 {
};

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);
};
/**
* @}
*/
Expand Down
2 changes: 0 additions & 2 deletions ppapi/cpp/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ source_set("objects") {
"private/flash.h",
"private/flash_clipboard.cc",
"private/flash_clipboard.h",
"private/flash_device_id.cc",
"private/flash_device_id.h",
"private/flash_drm.cc",
"private/flash_drm.h",
"private/flash_file.cc",
Expand Down
45 changes: 0 additions & 45 deletions ppapi/cpp/private/flash_device_id.cc
View file

This file was deleted.

38 changes: 0 additions & 38 deletions ppapi/cpp/private/flash_drm.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,17 @@
#include "ppapi/cpp/private/flash_drm.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/cpp/module_impl.h"

namespace pp {

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>() {
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 flash {
Expand All @@ -36,12 +27,6 @@ DRM::DRM(const InstanceHandle& instance) : Resource() {
if (has_interface<PPB_Flash_DRM_1_1>()) {
PassRefFromConstructor(get_interface<PPB_Flash_DRM_1_1>()->Create(
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()));
}
}

Expand All @@ -52,18 +37,6 @@ int32_t DRM::GetDeviceID(const CompletionCallbackWithOutput<Var>& callback) {
callback.output(),
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);
}

Expand All @@ -73,11 +46,6 @@ bool DRM::GetHmonitor(int64_t* hmonitor) {
pp_resource(),
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;
}

Expand All @@ -89,12 +57,6 @@ int32_t DRM::GetVoucherFile(
callback.output(),
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;
}

Expand Down
67 changes: 0 additions & 67 deletions ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
#include "ppapi/c/private/ppb_file_ref_private.h"
#include "ppapi/c/private/ppb_flash.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_menu.h"
#include "ppapi/c/private/ppb_host_resolver_private.h"
Expand Down Expand Up @@ -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_5_0;
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_Menu_0_2;
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1;
Expand Down Expand Up @@ -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 */

/* 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 */

static PP_Resource Pnacl_M33_PPB_Flash_DRM_Create(PP_Instance instance) {
Expand Down Expand Up @@ -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
};

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 = {
.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,
Expand Down Expand Up @@ -6321,18 +6268,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_1 = {
.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 = {
.iface_macro = PPB_FLASH_DRM_INTERFACE_1_1,
.wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Flash_DRM_1_1,
Expand Down Expand Up @@ -6552,8 +6487,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
&Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0,
&Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0,
&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_Menu_0_2,
&Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1,
Expand Down
Loading

0 comments on commit c0debd5

Please sign in to comment.