Skip to content

Commit

Permalink
Remove content decryptor pepper APIs
Browse files Browse the repository at this point in the history 
Now that CDMs use mojo exclusively, remove the Pepper APIs that are
now unused.

BUG=772160
TEST=compiles

Change-Id: Ifa77be717e7b11ab20ae8053901dcb663b1726cc
Reviewed-on: https://chromium-review.googlesource.com/981125
Commit-Queue: John Rummell <jrummell@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Bill Budge <bbudge@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547187}
  • Loading branch information
@jrummell-chromium
jrummell-chromium authored and Commit Bot committed Mar 30, 2018
1 parent aeb7eca commit e16205d
Show file tree
Hide file tree
Showing 33 changed files with 1 addition and 5,411 deletions.
1 change: 0 additions & 1 deletion build/check_gn_headers_whitelist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h
ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h
ppapi/proxy/content_decryptor_private_serializer.h
ppapi/proxy/dispatch_reply_message.h
ppapi/proxy/plugin_proxy_delegate.h
ppapi/proxy/plugin_resource_callback.h
Expand Down
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 @@ -74,7 +74,6 @@
#include "ppapi/c/ppb_websocket.h"
#include "ppapi/c/private/ppb_camera_capabilities_private.h"
#include "ppapi/c/private/ppb_camera_device_private.h"
#include "ppapi/c/private/ppb_content_decryptor_private.h"
#include "ppapi/c/private/ppb_ext_crx_file_system_private.h"
#include "ppapi/c/private/ppb_file_io_private.h"
#include "ppapi/c/private/ppb_file_ref_private.h"
Expand Down
114 changes: 0 additions & 114 deletions content/renderer/pepper/pepper_plugin_instance_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2562,120 +2562,6 @@ PP_Var PepperPluginInstanceImpl::GetDefaultCharSet(PP_Instance instance) {
render_frame_->render_view()->webkit_preferences().default_encoding);
}

// These PPB_ContentDecryptor_Private calls are responses to
// PPP_ContentDecryptor_Private calls, which should never be made since pepper
// CDM is deprecated.
// TODO(crbug.com/772160): Remove these after ppapi/ is updated.
void PepperPluginInstanceImpl::PromiseResolved(PP_Instance instance,
uint32_t promise_id) {
NOTREACHED();
}

void PepperPluginInstanceImpl::PromiseResolvedWithKeyStatus(
PP_Instance instance,
uint32_t promise_id,
PP_CdmKeyStatus key_status) {
NOTREACHED();
}

void PepperPluginInstanceImpl::PromiseResolvedWithSession(
PP_Instance instance,
uint32_t promise_id,
PP_Var session_id_var) {
NOTREACHED();
}

void PepperPluginInstanceImpl::PromiseRejected(
PP_Instance instance,
uint32_t promise_id,
PP_CdmExceptionCode exception_code,
uint32_t system_code,
PP_Var error_description_var) {
NOTREACHED();
}

void PepperPluginInstanceImpl::SessionMessage(PP_Instance instance,
PP_Var session_id_var,
PP_CdmMessageType message_type,
PP_Var message_var,
PP_Var legacy_destination_url) {
NOTREACHED();
}

void PepperPluginInstanceImpl::SessionKeysChange(
PP_Instance instance,
PP_Var session_id_var,
PP_Bool has_additional_usable_key,
uint32_t key_count,
const struct PP_KeyInformation key_information[]) {
NOTREACHED();
}

void PepperPluginInstanceImpl::SessionExpirationChange(
PP_Instance instance,
PP_Var session_id_var,
PP_Time new_expiry_time) {
NOTREACHED();
}

void PepperPluginInstanceImpl::SessionClosed(PP_Instance instance,
PP_Var session_id_var) {
NOTREACHED();
}

void PepperPluginInstanceImpl::LegacySessionError(
PP_Instance instance,
PP_Var session_id_var,
PP_CdmExceptionCode exception_code,
uint32_t system_code,
PP_Var error_description_var) {
// Obsolete.
NOTREACHED();
}

void PepperPluginInstanceImpl::DeliverBlock(
PP_Instance instance,
PP_Resource decrypted_block,
const PP_DecryptedBlockInfo* block_info) {
NOTREACHED();
}

void PepperPluginInstanceImpl::DecoderInitializeDone(
PP_Instance instance,
PP_DecryptorStreamType decoder_type,
uint32_t request_id,
PP_Bool success) {
NOTREACHED();
}

void PepperPluginInstanceImpl::DecoderDeinitializeDone(
PP_Instance instance,
PP_DecryptorStreamType decoder_type,
uint32_t request_id) {
NOTREACHED();
}

void PepperPluginInstanceImpl::DecoderResetDone(
PP_Instance instance,
PP_DecryptorStreamType decoder_type,
uint32_t request_id) {
NOTREACHED();
}

void PepperPluginInstanceImpl::DeliverFrame(
PP_Instance instance,
PP_Resource decrypted_frame,
const PP_DecryptedFrameInfo* frame_info) {
NOTREACHED();
}

void PepperPluginInstanceImpl::DeliverSamples(
PP_Instance instance,
PP_Resource audio_frames,
const PP_DecryptedSampleInfo* sample_info) {
NOTREACHED();
}

void PepperPluginInstanceImpl::SetPluginToHandleFindRequests(
PP_Instance instance) {
if (!LoadFindInterface())
Expand Down
54 changes: 0 additions & 54 deletions content/renderer/pepper/pepper_plugin_instance_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include "ppapi/c/ppp_graphics_3d.h"
#include "ppapi/c/ppp_input_event.h"
#include "ppapi/c/ppp_mouse_lock.h"
#include "ppapi/c/private/ppb_content_decryptor_private.h"
#include "ppapi/c/private/ppp_find_private.h"
#include "ppapi/c/private/ppp_instance_private.h"
#include "ppapi/c/private/ppp_pdf.h"
Expand Down Expand Up @@ -487,59 +486,6 @@ class CONTENT_EXPORT PepperPluginInstanceImpl
PP_Var GetPluginReferrerURL(PP_Instance instance,
PP_URLComponents_Dev* components) override;

// PPB_ContentDecryptor_Private implementation.
void PromiseResolved(PP_Instance instance, uint32_t promise_id) override;
void PromiseResolvedWithKeyStatus(PP_Instance instance,
uint32_t promise_id,
PP_CdmKeyStatus key_status) override;
void PromiseResolvedWithSession(PP_Instance instance,
uint32_t promise_id,
PP_Var session_id_var) override;
void PromiseRejected(PP_Instance instance,
uint32_t promise_id,
PP_CdmExceptionCode exception_code,
uint32_t system_code,
PP_Var error_description_var) override;
void SessionMessage(PP_Instance instance,
PP_Var session_id_var,
PP_CdmMessageType message_type,
PP_Var message_var,
PP_Var legacy_destination_url) override;
void SessionKeysChange(
PP_Instance instance,
PP_Var session_id_var,
PP_Bool has_additional_usable_key,
uint32_t key_count,
const struct PP_KeyInformation key_information[]) override;
void SessionExpirationChange(PP_Instance instance,
PP_Var session_id_var,
PP_Time new_expiry_time) override;
void SessionClosed(PP_Instance instance, PP_Var session_id_var) override;
void LegacySessionError(PP_Instance instance,
PP_Var session_id_var,
PP_CdmExceptionCode exception_code,
uint32_t system_code,
PP_Var error_description_var) override;
void DeliverBlock(PP_Instance instance,
PP_Resource decrypted_block,
const PP_DecryptedBlockInfo* block_info) override;
void DecoderInitializeDone(PP_Instance instance,
PP_DecryptorStreamType decoder_type,
uint32_t request_id,
PP_Bool success) override;
void DecoderDeinitializeDone(PP_Instance instance,
PP_DecryptorStreamType decoder_type,
uint32_t request_id) override;
void DecoderResetDone(PP_Instance instance,
PP_DecryptorStreamType decoder_type,
uint32_t request_id) override;
void DeliverFrame(PP_Instance instance,
PP_Resource decrypted_frame,
const PP_DecryptedFrameInfo* frame_info) override;
void DeliverSamples(PP_Instance instance,
PP_Resource audio_frames,
const PP_DecryptedSampleInfo* sample_info) override;

// Reset this instance as proxied. Assigns the instance a new module, resets
// cached interfaces to point to the out-of-process proxy and re-sends
// DidCreate, DidChangeView, and HandleDocumentLoad (if necessary).
Expand Down
Loading

0 comments on commit e16205d

Please sign in to comment.