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

Unified Diff: content/renderer/media/crypto/renderer_cdm_manager.cc

Issue 665563002: Add MediaKeys::GetCdmId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Make GetCdmId() pure virtual. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/crypto/renderer_cdm_manager.h ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/crypto/renderer_cdm_manager.cc
diff --git a/content/renderer/media/crypto/renderer_cdm_manager.cc b/content/renderer/media/crypto/renderer_cdm_manager.cc
index ba2e87837566e383aeb4f8b6d31a72a26276651b..3bfdc6e0709f3a474b16b5b5274d506522f8b7ed 100644
--- a/content/renderer/media/crypto/renderer_cdm_manager.cc
+++ b/content/renderer/media/crypto/renderer_cdm_manager.cc
@@ -18,7 +18,7 @@ const size_t kMaxSessionMessageLength = 10240; // 10 KB
RendererCdmManager::RendererCdmManager(RenderFrame* render_frame)
: RenderFrameObserver(render_frame),
- next_cdm_id_(kInvalidCdmId + 1) {
+ next_cdm_id_(media::MediaKeys::kInvalidCdmId + 1) {
}
RendererCdmManager::~RendererCdmManager() {
@@ -127,7 +127,7 @@ void RendererCdmManager::OnSessionError(int cdm_id,
int RendererCdmManager::RegisterMediaKeys(ProxyMediaKeys* media_keys) {
int cdm_id = next_cdm_id_++;
- DCHECK_NE(cdm_id, kInvalidCdmId);
+ DCHECK_NE(cdm_id, media::MediaKeys::kInvalidCdmId);
DCHECK(!ContainsKey(proxy_media_keys_map_, cdm_id));
proxy_media_keys_map_[cdm_id] = media_keys;
return cdm_id;
« no previous file with comments | « content/renderer/media/crypto/renderer_cdm_manager.h ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698