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

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

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (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 | « DEPS ('k') | 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::SessionClosedCB& session_closed_cb, 101 const media::SessionClosedCB& session_closed_cb,
102 const media::SessionErrorCB& session_error_cb, 102 const media::SessionErrorCB& session_error_cb,
103 const media::SessionKeysChangeCB& session_keys_change_cb, 103 const media::SessionKeysChangeCB& session_keys_change_cb,
104 const media::SessionExpirationUpdateCB& session_expiration_update_cb); 104 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
105 105
106 void OnDecoderInitialized(StreamType stream_type, bool success); 106 void OnDecoderInitialized(StreamType stream_type, bool success);
107 107
108 // Callbacks for |plugin_cdm_delegate_| to fire session events. 108 // Callbacks for |plugin_cdm_delegate_| to fire session events.
109 void OnSessionMessage(const std::string& web_session_id, 109 void OnSessionMessage(const std::string& web_session_id,
110 MediaKeys::MessageType message_type, 110 MediaKeys::MessageType message_type,
111 const std::vector<uint8>& message); 111 const std::vector<uint8>& message,
112 const GURL& legacy_destination_url);
112 void OnSessionKeysChange(const std::string& web_session_id, 113 void OnSessionKeysChange(const std::string& web_session_id,
113 bool has_additional_usable_key, 114 bool has_additional_usable_key,
114 media::CdmKeysInfo keys_info); 115 media::CdmKeysInfo keys_info);
115 void OnSessionExpirationUpdate(const std::string& web_session_id, 116 void OnSessionExpirationUpdate(const std::string& web_session_id,
116 const base::Time& new_expiry_time); 117 const base::Time& new_expiry_time);
117 void OnSessionClosed(const std::string& web_session_id); 118 void OnSessionClosed(const std::string& web_session_id);
118 void OnSessionError(const std::string& web_session_id, 119 void OnSessionError(const std::string& web_session_id,
119 MediaKeys::Exception exception_code, 120 MediaKeys::Exception exception_code,
120 uint32 system_code, 121 uint32 system_code,
121 const std::string& error_description); 122 const std::string& error_description);
(...skipping 27 matching lines...) Expand all
149 150
150 // NOTE: Weak pointers must be invalidated before all other member variables. 151 // NOTE: Weak pointers must be invalidated before all other member variables.
151 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 152 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
152 153
153 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 154 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
154 }; 155 };
155 156
156 } // namespace content 157 } // namespace content
157 158
158 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 159 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « DEPS ('k') | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698