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

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

Issue 150203014: Prefixed EME: Fire special KeyError when a persistent session is closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/media/crypto/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 CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set>
9 #include <string> 10 #include <string>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/basictypes.h" 13 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
15 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
16 #include "media/base/decryptor.h" 17 #include "media/base/decryptor.h"
17 #include "media/base/media_keys.h" 18 #include "media/base/media_keys.h"
18 19
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 KeyErrorCB key_error_cb_; 135 KeyErrorCB key_error_cb_;
135 KeyMessageCB key_message_cb_; 136 KeyMessageCB key_message_cb_;
136 137
137 // Session IDs are used to uniquely track sessions so that CDM callbacks 138 // Session IDs are used to uniquely track sessions so that CDM callbacks
138 // can get mapped to the correct session ID. Session ID should be unique 139 // can get mapped to the correct session ID. Session ID should be unique
139 // per renderer process for debugging purposes. 140 // per renderer process for debugging purposes.
140 static uint32 next_session_id_; 141 static uint32 next_session_id_;
141 142
142 SessionIdMap sessions_; 143 SessionIdMap sessions_;
143 144
145 std::set<uint32> persistent_sessions_;
146
144 bool is_clear_key_; 147 bool is_clear_key_;
145 148
146 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); 149 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
147 }; 150 };
148 151
149 } // namespace content 152 } // namespace content
150 153
151 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_ 154 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698