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

Side by Side Diff: media/cdm/proxy_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 | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/cdm/proxy_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 MEDIA_CDM_PROXY_DECRYPTOR_H_ 5 #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_
6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_ 6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 private: 66 private:
67 // Helper function to create MediaKeys to handle the given |key_system|. 67 // Helper function to create MediaKeys to handle the given |key_system|.
68 scoped_ptr<MediaKeys> CreateMediaKeys( 68 scoped_ptr<MediaKeys> CreateMediaKeys(
69 CdmFactory* cdm_factory, 69 CdmFactory* cdm_factory,
70 const std::string& key_system, 70 const std::string& key_system,
71 const GURL& security_origin); 71 const GURL& security_origin);
72 72
73 // Callbacks for firing session events. 73 // Callbacks for firing session events.
74 void OnSessionMessage(const std::string& web_session_id, 74 void OnSessionMessage(const std::string& web_session_id,
75 MediaKeys::MessageType message_type, 75 MediaKeys::MessageType message_type,
76 const std::vector<uint8>& message); 76 const std::vector<uint8>& message,
77 const GURL& legacy_destination_url);
77 void OnSessionKeysChange(const std::string& web_session_id, 78 void OnSessionKeysChange(const std::string& web_session_id,
78 bool has_additional_usable_key, 79 bool has_additional_usable_key,
79 CdmKeysInfo keys_info); 80 CdmKeysInfo keys_info);
80 void OnSessionExpirationUpdate(const std::string& web_session_id, 81 void OnSessionExpirationUpdate(const std::string& web_session_id,
81 const base::Time& new_expiry_time); 82 const base::Time& new_expiry_time);
82 void GenerateKeyAdded(const std::string& web_session_id); 83 void GenerateKeyAdded(const std::string& web_session_id);
83 void OnSessionClosed(const std::string& web_session_id); 84 void OnSessionClosed(const std::string& web_session_id);
84 void OnSessionError(const std::string& web_session_id, 85 void OnSessionError(const std::string& web_session_id,
85 MediaKeys::Exception exception_code, 86 MediaKeys::Exception exception_code,
86 uint32 system_code, 87 uint32 system_code,
(...skipping 24 matching lines...) Expand all
111 112
112 // NOTE: Weak pointers must be invalidated before all other member variables. 113 // NOTE: Weak pointers must be invalidated before all other member variables.
113 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_; 114 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
114 115
115 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); 116 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
116 }; 117 };
117 118
118 } // namespace media 119 } // namespace media
119 120
120 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_ 121 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698