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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.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 + DEPS 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
6 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 6 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // PPB_ContentDecryptor_Private dispatching methods. 103 // PPB_ContentDecryptor_Private dispatching methods.
104 void OnPromiseResolved(uint32 promise_id); 104 void OnPromiseResolved(uint32 promise_id);
105 void OnPromiseResolvedWithSession(uint32 promise_id, PP_Var web_session_id); 105 void OnPromiseResolvedWithSession(uint32 promise_id, PP_Var web_session_id);
106 void OnPromiseRejected(uint32 promise_id, 106 void OnPromiseRejected(uint32 promise_id,
107 PP_CdmExceptionCode exception_code, 107 PP_CdmExceptionCode exception_code,
108 uint32 system_code, 108 uint32 system_code,
109 PP_Var error_description); 109 PP_Var error_description);
110 void OnSessionMessage(PP_Var web_session_id, 110 void OnSessionMessage(PP_Var web_session_id,
111 PP_CdmMessageType message_type, 111 PP_CdmMessageType message_type,
112 PP_Var message); 112 PP_Var message,
113 PP_Var legacy_destination_url);
113 void OnSessionKeysChange(PP_Var web_session_id, 114 void OnSessionKeysChange(PP_Var web_session_id,
114 PP_Bool has_additional_usable_key, 115 PP_Bool has_additional_usable_key,
115 uint32_t key_count, 116 uint32_t key_count,
116 const struct PP_KeyInformation key_information[]); 117 const struct PP_KeyInformation key_information[]);
117 void OnSessionExpirationChange(PP_Var web_session_id, 118 void OnSessionExpirationChange(PP_Var web_session_id,
118 PP_Time new_expiry_time); 119 PP_Time new_expiry_time);
119 void OnSessionClosed(PP_Var web_session_id); 120 void OnSessionClosed(PP_Var web_session_id);
120 void OnSessionError(PP_Var web_session_id, 121 void OnSessionError(PP_Var web_session_id,
121 PP_CdmExceptionCode exception_code, 122 PP_CdmExceptionCode exception_code,
122 uint32 system_code, 123 uint32 system_code,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 246
246 base::WeakPtr<ContentDecryptorDelegate> weak_this_; 247 base::WeakPtr<ContentDecryptorDelegate> weak_this_;
247 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_; 248 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
248 249
249 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate); 250 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
250 }; 251 };
251 252
252 } // namespace content 253 } // namespace content
253 254
254 #endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 255 #endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698