| Index: webkit/media/crypto/ppapi/clear_key_cdm.h
|
| diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
|
| index eaad45d9b2e095ba2e765f95e410523ade03de8f..44b3110e315dcc17353d302d724d80a125238f98 100644
|
| --- a/webkit/media/crypto/ppapi/clear_key_cdm.h
|
| +++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
|
| @@ -31,19 +31,23 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
|
| virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
|
| int init_data_size,
|
| cdm::KeyMessage* key_request) OVERRIDE;
|
| -
|
| virtual cdm::Status AddKey(const char* session_id,
|
| int session_id_size,
|
| const uint8_t* key,
|
| int key_size,
|
| const uint8_t* key_id,
|
| int key_id_size) OVERRIDE;
|
| -
|
| virtual cdm::Status CancelKeyRequest(const char* session_id,
|
| int session_id_size) OVERRIDE;
|
| -
|
| virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
|
| cdm::OutputBuffer* decrypted_buffer) OVERRIDE;
|
| + virtual cdm::Status InitializeVideoDecoder(
|
| + const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
|
| + virtual cdm::Status DecryptAndDecodeVideo(
|
| + const cdm::InputBuffer& encrypted_buffer,
|
| + cdm::VideoFrame* video_frame) OVERRIDE;
|
| + virtual void ResetVideoDecoder() OVERRIDE;
|
| + virtual void StopVideoDecoder() OVERRIDE;
|
|
|
| private:
|
| class Client : public media::DecryptorClient {
|
|
|