Chromium Code Reviews| Index: content/public/renderer/content_renderer_client.cc |
| diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc |
| index 79b40ac8e94c80fb27676ca301ae226a96844904..dccd37ef5ad5aaa511b28f74a8d42acd8393c87e 100644 |
| --- a/content/public/renderer/content_renderer_client.cc |
| +++ b/content/public/renderer/content_renderer_client.cc |
| @@ -5,6 +5,7 @@ |
| #include "content/public/renderer/content_renderer_client.h" |
| #include "media/base/renderer_factory.h" |
| +#include "media/filters/default_renderer_factory.h" |
| #include "third_party/WebKit/public/web/WebPluginPlaceholder.h" |
| namespace content { |
| @@ -175,8 +176,11 @@ void ContentRendererClient::AddKeySystems( |
| } |
| scoped_ptr<media::RendererFactory> |
| -ContentRendererClient::CreateMediaRendererFactory(RenderFrame* render_frame) { |
| - return nullptr; |
| +ContentRendererClient::CreateMediaRendererFactory( |
| + RenderFrame* render_frame, |
| + scoped_ptr<media::DefaultRendererFactory> default_factory) { |
| + scoped_ptr<media::RendererFactory> factory(default_factory.Pass()); |
| + return factory.Pass(); |
|
gunsch
2015/02/12 01:19:34
I think this can just be:
return default_factory.
servolk
2015/02/12 02:20:26
Hmm, I can't find scoped_ptr::PassAs method. The o
gunsch
2015/02/12 03:18:51
Oh, I think you can just use Pass now without the
servolk
2015/02/17 18:55:05
Done.
|
| } |
| bool ContentRendererClient::ShouldReportDetailedMessageForSource( |