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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 943903002: Pass MediaLog to CreateMediaRendererFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass medialog smart pointer by const reference 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 unified diff | Download patch
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1910 matching lines...) Expand 10 before | Expand all | Expand 10 after
1921 #else 1921 #else
1922 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory()); 1922 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory());
1923 #endif 1923 #endif
1924 1924
1925 #if defined(ENABLE_MEDIA_MOJO_RENDERER) 1925 #if defined(ENABLE_MEDIA_MOJO_RENDERER)
1926 scoped_ptr<media::RendererFactory> media_renderer_factory( 1926 scoped_ptr<media::RendererFactory> media_renderer_factory(
1927 new media::MojoRendererFactory(make_scoped_ptr( 1927 new media::MojoRendererFactory(make_scoped_ptr(
1928 new MediaRendererServiceProvider(GetServiceRegistry())))); 1928 new MediaRendererServiceProvider(GetServiceRegistry()))));
1929 #else 1929 #else
1930 scoped_ptr<media::RendererFactory> media_renderer_factory = 1930 scoped_ptr<media::RendererFactory> media_renderer_factory =
1931 GetContentClient()->renderer()->CreateMediaRendererFactory(this); 1931 GetContentClient()->renderer()->CreateMediaRendererFactory(this,
1932 media_log);
1932 1933
1933 if (!media_renderer_factory.get()) { 1934 if (!media_renderer_factory.get()) {
1934 media_renderer_factory.reset(new media::DefaultRendererFactory( 1935 media_renderer_factory.reset(new media::DefaultRendererFactory(
1935 media_log, render_thread->GetGpuFactories(), 1936 media_log, render_thread->GetGpuFactories(),
1936 *render_thread->GetAudioHardwareConfig())); 1937 *render_thread->GetAudioHardwareConfig()));
1937 } 1938 }
1938 #endif // defined(ENABLE_MEDIA_MOJO_RENDERER) 1939 #endif // defined(ENABLE_MEDIA_MOJO_RENDERER)
1939 1940
1940 return new media::WebMediaPlayerImpl( 1941 return new media::WebMediaPlayerImpl(
1941 frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(), 1942 frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(),
(...skipping 2500 matching lines...) Expand 10 before | Expand all | Expand 10 after
4442 4443
4443 #if defined(ENABLE_BROWSER_CDMS) 4444 #if defined(ENABLE_BROWSER_CDMS)
4444 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4445 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4445 if (!cdm_manager_) 4446 if (!cdm_manager_)
4446 cdm_manager_ = new RendererCdmManager(this); 4447 cdm_manager_ = new RendererCdmManager(this);
4447 return cdm_manager_; 4448 return cdm_manager_;
4448 } 4449 }
4449 #endif // defined(ENABLE_BROWSER_CDMS) 4450 #endif // defined(ENABLE_BROWSER_CDMS)
4450 4451
4451 } // namespace content 4452 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698