OLD | NEW |
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 2026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2037 #else | 2037 #else |
2038 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); | 2038 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); |
2039 | 2039 |
2040 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 2040 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
2041 media::WebMediaPlayerParams params( | 2041 media::WebMediaPlayerParams params( |
2042 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2042 base::Bind(&ContentRendererClient::DeferMediaLoad, |
2043 base::Unretained(GetContentClient()->renderer()), | 2043 base::Unretained(GetContentClient()->renderer()), |
2044 static_cast<RenderFrame*>(this)), | 2044 static_cast<RenderFrame*>(this)), |
2045 render_thread->GetAudioRendererMixerManager()->CreateInput(routing_id_), | 2045 render_thread->GetAudioRendererMixerManager()->CreateInput(routing_id_), |
2046 media_log, render_thread->GetMediaThreadTaskRunner(), | 2046 media_log, render_thread->GetMediaThreadTaskRunner(), |
| 2047 render_thread->GetWorkerTaskRunner(), |
2047 render_thread->compositor_task_runner(), | 2048 render_thread->compositor_task_runner(), |
2048 base::Bind(&GetSharedMainThreadContext3D), GetMediaPermission(), | 2049 base::Bind(&GetSharedMainThreadContext3D), GetMediaPermission(), |
2049 initial_cdm); | 2050 initial_cdm); |
2050 | 2051 |
2051 #if defined(ENABLE_MOJO_MEDIA) | 2052 #if defined(ENABLE_MOJO_MEDIA) |
2052 scoped_ptr<media::RendererFactory> media_renderer_factory( | 2053 scoped_ptr<media::RendererFactory> media_renderer_factory( |
2053 new media::MojoRendererFactory(GetMediaServiceFactory())); | 2054 new media::MojoRendererFactory(GetMediaServiceFactory())); |
2054 #else | 2055 #else |
2055 scoped_ptr<media::RendererFactory> media_renderer_factory = | 2056 scoped_ptr<media::RendererFactory> media_renderer_factory = |
2056 GetContentClient()->renderer()->CreateMediaRendererFactory( | 2057 GetContentClient()->renderer()->CreateMediaRendererFactory( |
(...skipping 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5073 void RenderFrameImpl::RegisterMojoServices() { | 5074 void RenderFrameImpl::RegisterMojoServices() { |
5074 // Only main frame have ImageDownloader service. | 5075 // Only main frame have ImageDownloader service. |
5075 if (!frame_->parent()) { | 5076 if (!frame_->parent()) { |
5076 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5077 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
5077 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5078 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
5078 base::Unretained(this))); | 5079 base::Unretained(this))); |
5079 } | 5080 } |
5080 } | 5081 } |
5081 | 5082 |
5082 } // namespace content | 5083 } // namespace content |
OLD | NEW |