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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromecast/browser/media/cma_message_filter_host.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « chromecast/browser/media/cast_browser_cdm_factory.cc ('k') | chromecast/media/cdm/browser_cdm_cast.h » ('j') | chromecast/media/cdm/browser_cdm_cast.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/media/cma_message_filter_host.cc
diff --git a/chromecast/browser/media/cma_message_filter_host.cc b/chromecast/browser/media/cma_message_filter_host.cc
index 0a531e71f81766293b68b45319db0ccb67f1c33e..adfd050180d14fae42fffd14d7a5945dc22c267f 100644
--- a/chromecast/browser/media/cma_message_filter_host.cc
+++ b/chromecast/browser/media/cma_message_filter_host.cc
@@ -108,7 +108,7 @@ void SetCdmOnUiThread(
return;
}
- ::media::BrowserCdm* cdm = host->GetBrowserCdm(render_frame_id, cdm_id);
+ scoped_refptr<::media::MediaKeys> cdm = host->GetCdm(render_frame_id, cdm_id);
if (!cdm) {
LOG(WARNING) << "Could not find BrowserCdm (" << render_frame_id << ","
<< cdm_id << ")";
@@ -116,13 +116,13 @@ void SetCdmOnUiThread(
}
BrowserCdmCast* browser_cdm_cast =
- static_cast<BrowserCdmCastUi*>(cdm)->browser_cdm_cast();
+ static_cast<BrowserCdmCastUi*>(cdm.get())->browser_cdm_cast();
MediaMessageLoop::GetTaskRunner()->PostTask(
FROM_HERE,
base::Bind(&SetCdmOnCmaThread,
render_process_id,
media_id,
- browser_cdm_cast));
+ base::Unretained(browser_cdm_cast)));
xhwang 2015/10/28 20:39:58 Does it make sense to pass the scoped_refptr here
}
} // namespace
« no previous file with comments | « chromecast/browser/media/cast_browser_cdm_factory.cc ('k') | chromecast/media/cdm/browser_cdm_cast.h » ('j') | chromecast/media/cdm/browser_cdm_cast.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698