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

Side by Side Diff: content/renderer/media/crypto/ppapi_decryptor.h

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes Created 5 years, 11 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 | content/renderer/media/crypto/ppapi_decryptor.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 CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 const media::SessionKeysChangeCB& session_keys_change_cb, 101 const media::SessionKeysChangeCB& session_keys_change_cb,
102 const media::SessionExpirationUpdateCB& session_expiration_update_cb); 102 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
103 103
104 void OnDecoderInitialized(StreamType stream_type, bool success); 104 void OnDecoderInitialized(StreamType stream_type, bool success);
105 105
106 // Callbacks for |plugin_cdm_delegate_| to fire session events. 106 // Callbacks for |plugin_cdm_delegate_| to fire session events.
107 void OnSessionMessage(const std::string& web_session_id, 107 void OnSessionMessage(const std::string& web_session_id,
108 const std::vector<uint8>& message, 108 const std::vector<uint8>& message,
109 const GURL& destination_url); 109 const GURL& destination_url);
110 void OnSessionKeysChange(const std::string& web_session_id, 110 void OnSessionKeysChange(const std::string& web_session_id,
111 bool has_additional_usable_key); 111 bool has_additional_usable_key,
112 media::CdmKeysInfo keys_info);
112 void OnSessionExpirationUpdate(const std::string& web_session_id, 113 void OnSessionExpirationUpdate(const std::string& web_session_id,
113 const base::Time& new_expiry_time); 114 const base::Time& new_expiry_time);
114 void OnSessionClosed(const std::string& web_session_id); 115 void OnSessionClosed(const std::string& web_session_id);
115 void OnSessionError(const std::string& web_session_id, 116 void OnSessionError(const std::string& web_session_id,
116 MediaKeys::Exception exception_code, 117 MediaKeys::Exception exception_code,
117 uint32 system_code, 118 uint32 system_code,
118 const std::string& error_description); 119 const std::string& error_description);
119 120
120 void AttemptToResumePlayback(); 121 void AttemptToResumePlayback();
121 122
(...skipping 24 matching lines...) Expand all
146 147
147 // NOTE: Weak pointers must be invalidated before all other member variables. 148 // NOTE: Weak pointers must be invalidated before all other member variables.
148 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 149 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
149 150
150 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 151 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
151 }; 152 };
152 153
153 } // namespace content 154 } // namespace content
154 155
155 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 156 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698