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

Side by Side Diff: content/renderer/media/crypto/proxy_media_keys.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PROXY_MEDIA_KEYS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 media::CdmContext* GetCdmContext() override; 61 media::CdmContext* GetCdmContext() override;
62 62
63 // media::CdmContext implementation. 63 // media::CdmContext implementation.
64 media::Decryptor* GetDecryptor() override; 64 media::Decryptor* GetDecryptor() override;
65 int GetCdmId() const override; 65 int GetCdmId() const override;
66 66
67 // Callbacks. 67 // Callbacks.
68 void OnSessionCreated(uint32 session_id, const std::string& web_session_id); 68 void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
69 void OnSessionMessage(uint32 session_id, 69 void OnSessionMessage(uint32 session_id,
70 const std::vector<uint8>& message, 70 const std::vector<uint8>& message,
71 const GURL& destination_url); 71 const GURL& legacy_destination_url);
72 void OnSessionReady(uint32 session_id); 72 void OnSessionReady(uint32 session_id);
73 void OnSessionClosed(uint32 session_id); 73 void OnSessionClosed(uint32 session_id);
74 void OnSessionError(uint32 session_id, 74 void OnSessionError(uint32 session_id,
75 media::MediaKeys::KeyError error_code, 75 media::MediaKeys::KeyError error_code,
76 uint32 system_code); 76 uint32 system_code);
77 77
78 private: 78 private:
79 // The Android-specific code that handles sessions uses integer session ids 79 // The Android-specific code that handles sessions uses integer session ids
80 // (basically a reference id), but media::MediaKeys bases everything on 80 // (basically a reference id), but media::MediaKeys bases everything on
81 // web_session_id (a string representing the actual session id as generated 81 // web_session_id (a string representing the actual session id as generated
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 // Keep track of outstanding promises. This map owns the promise object. 126 // Keep track of outstanding promises. This map owns the promise object.
127 PromiseMap session_id_to_promise_map_; 127 PromiseMap session_id_to_promise_map_;
128 128
129 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); 129 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
130 }; 130 };
131 131
132 } // namespace content 132 } // namespace content
133 133
134 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 134 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | content/renderer/media/crypto/proxy_media_keys.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698