diff options
| author | servolk <servolk@chromium.org> | 2015-02-20 10:44:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 18:45:23 +0000 |
| commit | 04b667817aed5d9c54dd09194f81149828c69659 (patch) | |
| tree | 969ded5a7fc7193a5e6703057b9c457417705253 /chromecast | |
| parent | 0e657f72853e60d37eb4d1fab5be0fa674028d6b (diff) | |
| download | chromium_src-04b667817aed5d9c54dd09194f81149828c69659.zip chromium_src-04b667817aed5d9c54dd09194f81149828c69659.tar.gz chromium_src-04b667817aed5d9c54dd09194f81149828c69659.tar.bz2 | |
Pass MediaLog to CreateMediaRendererFactory
This will allow custom media renderers to instantiate
default renderer factory, which expects media log.
BUG=457959
Review URL: https://codereview.chromium.org/943903002
Cr-Commit-Position: refs/heads/master@{#317359}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/renderer/cast_content_renderer_client.cc | 3 | ||||
| -rw-r--r-- | chromecast/renderer/cast_content_renderer_client.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromecast/renderer/cast_content_renderer_client.cc b/chromecast/renderer/cast_content_renderer_client.cc index 15f82b61..628562f 100644 --- a/chromecast/renderer/cast_content_renderer_client.cc +++ b/chromecast/renderer/cast_content_renderer_client.cc @@ -142,7 +142,8 @@ void CastContentRendererClient::AddKeySystems( #if !defined(OS_ANDROID) scoped_ptr<::media::RendererFactory> CastContentRendererClient::CreateMediaRendererFactory( - ::content::RenderFrame* render_frame) { + ::content::RenderFrame* render_frame, + const scoped_refptr<media::MediaLog>& media_log) { const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) return nullptr; diff --git a/chromecast/renderer/cast_content_renderer_client.h b/chromecast/renderer/cast_content_renderer_client.h index c41b98d..efdc3a5 100644 --- a/chromecast/renderer/cast_content_renderer_client.h +++ b/chromecast/renderer/cast_content_renderer_client.h @@ -42,7 +42,8 @@ class CastContentRendererClient : public content::ContentRendererClient { std::vector< ::media::KeySystemInfo>* key_systems) override; #if !defined(OS_ANDROID) scoped_ptr<media::RendererFactory> CreateMediaRendererFactory( - content::RenderFrame* render_frame) override; + content::RenderFrame* render_frame, + const scoped_refptr<media::MediaLog>& media_log) override; #endif blink::WebPrescientNetworking* GetPrescientNetworking() override; void DeferMediaLoad(content::RenderFrame* render_frame, |