Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Side by Side Diff: media/cdm/ppapi/cdm_adapter.h

Issue 497153005: ReleaseSession() should call RemoveSession() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reorder Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 5 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual void Initialize(const std::string& key_system) OVERRIDE; 60 virtual void Initialize(const std::string& key_system) OVERRIDE;
61 virtual void CreateSession(uint32_t promise_id, 61 virtual void CreateSession(uint32_t promise_id,
62 const std::string& init_data_type, 62 const std::string& init_data_type,
63 pp::VarArrayBuffer init_data, 63 pp::VarArrayBuffer init_data,
64 PP_SessionType session_type) OVERRIDE; 64 PP_SessionType session_type) OVERRIDE;
65 virtual void LoadSession(uint32_t promise_id, 65 virtual void LoadSession(uint32_t promise_id,
66 const std::string& web_session_id) OVERRIDE; 66 const std::string& web_session_id) OVERRIDE;
67 virtual void UpdateSession(uint32_t promise_id, 67 virtual void UpdateSession(uint32_t promise_id,
68 const std::string& web_session_id, 68 const std::string& web_session_id,
69 pp::VarArrayBuffer response) OVERRIDE; 69 pp::VarArrayBuffer response) OVERRIDE;
70 // TODO(jrummell): Rename to CloseSession(). 70 // TODO(jrummell): Pass this function through Pepper and add OVERRIDE.
71 virtual void CloseSession(uint32_t promise_id,
72 const std::string& web_session_id);
73 // TODO(jrummell): Rename to RemoveSession().
71 virtual void ReleaseSession(uint32_t promise_id, 74 virtual void ReleaseSession(uint32_t promise_id,
72 const std::string& web_session_id) OVERRIDE; 75 const std::string& web_session_id) OVERRIDE;
73 // TODO(jrummell): Pass these 2 functions through Pepper and add OVERRIDE. 76 // TODO(jrummell): Pass this function through Pepper and add OVERRIDE.
74 virtual void RemoveSession(uint32_t promise_id,
75 const std::string& web_session_id);
76 virtual void GetUsableKeyIds(uint32_t promise_id, 77 virtual void GetUsableKeyIds(uint32_t promise_id,
77 const std::string& web_session_id); 78 const std::string& web_session_id);
78 virtual void Decrypt( 79 virtual void Decrypt(
79 pp::Buffer_Dev encrypted_buffer, 80 pp::Buffer_Dev encrypted_buffer,
80 const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE; 81 const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
81 virtual void InitializeAudioDecoder( 82 virtual void InitializeAudioDecoder(
82 const PP_AudioDecoderConfig& decoder_config, 83 const PP_AudioDecoderConfig& decoder_config,
83 pp::Buffer_Dev extra_data_buffer) OVERRIDE; 84 pp::Buffer_Dev extra_data_buffer) OVERRIDE;
84 virtual void InitializeVideoDecoder( 85 virtual void InitializeVideoDecoder(
85 const PP_VideoDecoderConfig& decoder_config, 86 const PP_VideoDecoderConfig& decoder_config,
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 uint32_t deferred_audio_decoder_config_id_; 311 uint32_t deferred_audio_decoder_config_id_;
311 bool deferred_initialize_video_decoder_; 312 bool deferred_initialize_video_decoder_;
312 uint32_t deferred_video_decoder_config_id_; 313 uint32_t deferred_video_decoder_config_id_;
313 314
314 DISALLOW_COPY_AND_ASSIGN(CdmAdapter); 315 DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
315 }; 316 };
316 317
317 } // namespace media 318 } // namespace media
318 319
319 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 320 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
OLDNEW
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698