Commit 77548d02 authored by xhwang's avatar xhwang Committed by Commit bot

media: Remove CreateMediaRendererFactory()

Now ChromeCast has switched to use mojo Renderer, nobody is using this
path any more.

BUG=571155
TEST=No functionality change

Review-Url: https://codereview.chromium.org/2325733002
Cr-Commit-Position: refs/heads/master@{#417515}
parent 85b9a772
......@@ -168,14 +168,6 @@ bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) {
void ContentRendererClient::AddSupportedKeySystems(
std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) {}
std::unique_ptr<media::RendererFactory>
ContentRendererClient::CreateMediaRendererFactory(
RenderFrame* render_frame,
media::GpuVideoAcceleratorFactories* gpu_factories,
const scoped_refptr<media::MediaLog>& media_log) {
return nullptr;
}
std::unique_ptr<MediaStreamRendererFactory>
ContentRendererClient::CreateMediaStreamRendererFactory() {
return nullptr;
......
......@@ -264,12 +264,6 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if the page at |url| can use Pepper MediaStream APIs.
virtual bool AllowPepperMediaStreamAPI(const GURL& url);
// Allows an embedder to provide a media::RendererFactory.
virtual std::unique_ptr<media::RendererFactory> CreateMediaRendererFactory(
RenderFrame* render_frame,
media::GpuVideoAcceleratorFactories* gpu_factories,
const scoped_refptr<media::MediaLog>& media_log);
// Allows an embedder to provide a MediaStreamRendererFactory.
virtual std::unique_ptr<MediaStreamRendererFactory>
CreateMediaStreamRendererFactory();
......
......@@ -2633,16 +2633,11 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
base::Unretained(render_thread)),
GetMediaInterfaceProvider()));
#else
std::unique_ptr<media::RendererFactory> media_renderer_factory =
GetContentClient()->renderer()->CreateMediaRendererFactory(
this, render_thread->GetGpuFactories(), media_log);
if (!media_renderer_factory.get()) {
media_renderer_factory.reset(new media::DefaultRendererFactory(
media_log, GetDecoderFactory(),
base::Bind(&RenderThreadImpl::GetGpuFactories,
base::Unretained(render_thread))));
}
std::unique_ptr<media::RendererFactory> media_renderer_factory(
new media::DefaultRendererFactory(
media_log, GetDecoderFactory(),
base::Bind(&RenderThreadImpl::GetGpuFactories,
base::Unretained(render_thread))));
#endif // defined(ENABLE_MOJO_RENDERER)
if (!url_index_.get() || url_index_->frame() != frame_)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment