content/public/renderer/content_renderer_client.cc - Issue 883353012: Pass default renderer factory into CreateMediaRendererFactory

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/renderer/content_renderer_client.cc

Issue 883353012: Pass default renderer factory into CreateMediaRendererFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use scoped_ptr implicit upcast Created 5 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 side-by-side diff with in-line comments

Download patch

« chromecast/renderer/cast_content_renderer_client.cc ('K') | « content/public/renderer/content_renderer_client.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..4a7898abce9dd4fab0b1269f016f9b7c6b43dd84 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,10 @@ 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) {

+ return default_factory.Pass();

}

bool ContentRendererClient::ShouldReportDetailedMessageForSource(