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 4684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4695 } | 4695 } |
4696 | 4696 |
4697 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( | 4697 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( |
4698 WebMediaPlayerClient* client) { | 4698 WebMediaPlayerClient* client) { |
4699 #if defined(ENABLE_WEBRTC) | 4699 #if defined(ENABLE_WEBRTC) |
4700 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 4700 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
4701 bool found_neon = | 4701 bool found_neon = |
4702 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; | 4702 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; |
4703 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); | 4703 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); |
4704 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 4704 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
4705 return new WebMediaPlayerMS(frame_, client, weak_factory_.GetWeakPtr(), | 4705 return new WebMediaPlayerMS( |
4706 new RenderMediaLog(), | 4706 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), |
4707 CreateRendererFactory()); | 4707 CreateRendererFactory(), |
| 4708 RenderThreadImpl::current()->compositor_task_runner()); |
4708 #else | 4709 #else |
4709 return NULL; | 4710 return NULL; |
4710 #endif // defined(ENABLE_WEBRTC) | 4711 #endif // defined(ENABLE_WEBRTC) |
4711 } | 4712 } |
4712 | 4713 |
4713 scoped_ptr<MediaStreamRendererFactory> | 4714 scoped_ptr<MediaStreamRendererFactory> |
4714 RenderFrameImpl::CreateRendererFactory() { | 4715 RenderFrameImpl::CreateRendererFactory() { |
4715 scoped_ptr<MediaStreamRendererFactory> factory = | 4716 scoped_ptr<MediaStreamRendererFactory> factory = |
4716 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); | 4717 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); |
4717 if (factory.get()) | 4718 if (factory.get()) |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5069 void RenderFrameImpl::RegisterMojoServices() { | 5070 void RenderFrameImpl::RegisterMojoServices() { |
5070 // Only main frame have ImageDownloader service. | 5071 // Only main frame have ImageDownloader service. |
5071 if (!frame_->parent()) { | 5072 if (!frame_->parent()) { |
5072 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5073 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
5073 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5074 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
5074 base::Unretained(this))); | 5075 base::Unretained(this))); |
5075 } | 5076 } |
5076 } | 5077 } |
5077 | 5078 |
5078 } // namespace content | 5079 } // namespace content |
OLD | NEW |