From 902ff561fa17e181811392a222b0ecf0c8d53cdc Mon Sep 17 00:00:00 2001 From: xhwang Date: Thu, 8 Jan 2015 16:11:13 -0800 Subject: Implement OnLegacySessionError() in CdmAdapter. This is the same as OnSessionError() in CDM_6 implementation. It's needed to properly support prefixed EME API. Also roll src/media/cdm/ppapi/api 09203a7:4aca594 (svn 293431:293568) Summary of changes available at: https://chromium.googlesource.com/chromium/cdm/+log/09203a7..4aca594 BUG=428384 Review URL: https://codereview.chromium.org/820133003 Cr-Commit-Position: refs/heads/master@{#310636} --- media/cdm/ppapi/cdm_adapter.cc | 11 +++++++++++ media/cdm/ppapi/cdm_adapter.h | 6 ++++++ 2 files changed, 17 insertions(+) (limited to 'media') diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc index 1d79465..1d36db9 100644 --- a/media/cdm/ppapi/cdm_adapter.cc +++ b/media/cdm/ppapi/cdm_adapter.cc @@ -812,6 +812,17 @@ void CdmAdapter::OnSessionError(const char* session_id, std::string(error_message, error_message_size)))); } +// cdm::Host_7 only. +void CdmAdapter::OnLegacySessionError(const char* session_id, + uint32_t session_id_size, + cdm::Error error, + uint32_t system_code, + const char* error_message, + uint32_t error_message_size) { + OnSessionError(session_id, session_id_size, error, system_code, error_message, + error_message_size); +} + // Helpers to pass the event to Pepper. void CdmAdapter::SendPromiseResolvedInternal(int32_t result, diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h index 206deeb..ef7bc20 100644 --- a/media/cdm/ppapi/cdm_adapter.h +++ b/media/cdm/ppapi/cdm_adapter.h @@ -121,6 +121,12 @@ class CdmAdapter : public pp::Instance, bool has_additional_usable_key, const cdm::KeyInformation* keys_info, uint32_t keys_info_count) override; + void OnLegacySessionError(const char* session_id, + uint32_t session_id_size, + cdm::Error error, + uint32_t system_code, + const char* error_message, + uint32_t error_message_size) override; // cdm::Host_6 implementation. void OnResolveKeyIdsPromise(uint32_t promise_id, -- cgit v1.1