| Index: media/cdm/ppapi/cdm_wrapper.h
|
| diff --git a/media/cdm/ppapi/cdm_wrapper.h b/media/cdm/ppapi/cdm_wrapper.h
|
| index 9e648b524d257be4588a6628975244d1e8be4003..7d05a4443a7de232479f4f5877501dcdaf9d2b9d 100644
|
| --- a/media/cdm/ppapi/cdm_wrapper.h
|
| +++ b/media/cdm/ppapi/cdm_wrapper.h
|
| @@ -182,7 +182,7 @@ class CdmWrapperImpl : public CdmWrapper {
|
| virtual bool SetServerCertificate(
|
| uint32_t promise_id,
|
| const uint8_t* server_certificate_data,
|
| - uint32_t server_certificate_data_size) OVERRIDE {
|
| + uint32_t server_certificate_data_size) override {
|
| cdm_->SetServerCertificate(
|
| promise_id, server_certificate_data, server_certificate_data_size);
|
| return true;
|
| @@ -193,7 +193,7 @@ class CdmWrapperImpl : public CdmWrapper {
|
| uint32_t init_data_type_size,
|
| const uint8_t* init_data,
|
| uint32_t init_data_size,
|
| - cdm::SessionType session_type) OVERRIDE {
|
| + cdm::SessionType session_type) override {
|
| // TODO(jrummell): Remove this code once |session_type| is passed through
|
| // Pepper. When removing, add the header back in for CDM4.
|
| PP_DCHECK(session_type == cdm::kTemporary);
|
| @@ -218,7 +218,7 @@ class CdmWrapperImpl : public CdmWrapper {
|
|
|
| virtual void LoadSession(uint32_t promise_id,
|
| const char* web_session_id,
|
| - uint32_t web_session_id_size) OVERRIDE {
|
| + uint32_t web_session_id_size) override {
|
| cdm_->LoadSession(promise_id, web_session_id, web_session_id_size);
|
| }
|
|
|
| @@ -226,7 +226,7 @@ class CdmWrapperImpl : public CdmWrapper {
|
| const char* web_session_id,
|
| uint32_t web_session_id_size,
|
| const uint8_t* response,
|
| - uint32_t response_size) OVERRIDE {
|
| + uint32_t response_size) override {
|
| cdm_->UpdateSession(promise_id,
|
| web_session_id,
|
| web_session_id_size,
|
| @@ -236,71 +236,71 @@ class CdmWrapperImpl : public CdmWrapper {
|
|
|
| virtual bool CloseSession(uint32_t promise_id,
|
| const char* web_session_id,
|
| - uint32_t web_session_id_size) OVERRIDE {
|
| + uint32_t web_session_id_size) override {
|
| cdm_->CloseSession(promise_id, web_session_id, web_session_id_size);
|
| return true;
|
| }
|
|
|
| virtual void RemoveSession(uint32_t promise_id,
|
| const char* web_session_id,
|
| - uint32_t web_session_id_size) OVERRIDE {
|
| + uint32_t web_session_id_size) override {
|
| cdm_->RemoveSession(promise_id, web_session_id, web_session_id_size);
|
| }
|
|
|
| virtual bool GetUsableKeyIds(uint32_t promise_id,
|
| const char* web_session_id,
|
| - uint32_t web_session_id_size) OVERRIDE {
|
| + uint32_t web_session_id_size) override {
|
| cdm_->GetUsableKeyIds(promise_id, web_session_id, web_session_id_size);
|
| return true;
|
| }
|
|
|
| - virtual void TimerExpired(void* context) OVERRIDE {
|
| + virtual void TimerExpired(void* context) override {
|
| cdm_->TimerExpired(context);
|
| }
|
|
|
| virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
|
| - cdm::DecryptedBlock* decrypted_buffer) OVERRIDE {
|
| + cdm::DecryptedBlock* decrypted_buffer) override {
|
| return cdm_->Decrypt(encrypted_buffer, decrypted_buffer);
|
| }
|
|
|
| virtual cdm::Status InitializeAudioDecoder(
|
| - const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE {
|
| + const cdm::AudioDecoderConfig& audio_decoder_config) override {
|
| return cdm_->InitializeAudioDecoder(audio_decoder_config);
|
| }
|
|
|
| virtual cdm::Status InitializeVideoDecoder(
|
| - const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE {
|
| + const cdm::VideoDecoderConfig& video_decoder_config) override {
|
| return cdm_->InitializeVideoDecoder(video_decoder_config);
|
| }
|
|
|
| - virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE {
|
| + virtual void DeinitializeDecoder(cdm::StreamType decoder_type) override {
|
| cdm_->DeinitializeDecoder(decoder_type);
|
| }
|
|
|
| - virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE {
|
| + virtual void ResetDecoder(cdm::StreamType decoder_type) override {
|
| cdm_->ResetDecoder(decoder_type);
|
| }
|
|
|
| virtual cdm::Status DecryptAndDecodeFrame(
|
| const cdm::InputBuffer& encrypted_buffer,
|
| - cdm::VideoFrame* video_frame) OVERRIDE {
|
| + cdm::VideoFrame* video_frame) override {
|
| return cdm_->DecryptAndDecodeFrame(encrypted_buffer, video_frame);
|
| }
|
|
|
| virtual cdm::Status DecryptAndDecodeSamples(
|
| const cdm::InputBuffer& encrypted_buffer,
|
| - cdm::AudioFrames* audio_frames) OVERRIDE {
|
| + cdm::AudioFrames* audio_frames) override {
|
| return cdm_->DecryptAndDecodeSamples(encrypted_buffer, audio_frames);
|
| }
|
|
|
| virtual void OnPlatformChallengeResponse(
|
| - const cdm::PlatformChallengeResponse& response) OVERRIDE {
|
| + const cdm::PlatformChallengeResponse& response) override {
|
| cdm_->OnPlatformChallengeResponse(response);
|
| }
|
|
|
| virtual void OnQueryOutputProtectionStatus(
|
| uint32_t link_mask,
|
| - uint32_t output_protection_mask) OVERRIDE {
|
| + uint32_t output_protection_mask) override {
|
| cdm_->OnQueryOutputProtectionStatus(link_mask, output_protection_mask);
|
| }
|
|
|
|
|