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 4670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4681 } | 4681 } |
4682 | 4682 |
4683 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( | 4683 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( |
4684 WebMediaPlayerClient* client) { | 4684 WebMediaPlayerClient* client) { |
4685 #if defined(ENABLE_WEBRTC) | 4685 #if defined(ENABLE_WEBRTC) |
4686 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 4686 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
4687 bool found_neon = | 4687 bool found_neon = |
4688 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; | 4688 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; |
4689 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); | 4689 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); |
4690 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 4690 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
4691 return new WebMediaPlayerMS(frame_, client, weak_factory_.GetWeakPtr(), | 4691 return new WebMediaPlayerMS( |
4692 new RenderMediaLog(), | 4692 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), |
4693 CreateRendererFactory()); | 4693 CreateRendererFactory(), |
| 4694 RenderThreadImpl::current()->compositor_task_runner()); |
4694 #else | 4695 #else |
4695 return NULL; | 4696 return NULL; |
4696 #endif // defined(ENABLE_WEBRTC) | 4697 #endif // defined(ENABLE_WEBRTC) |
4697 } | 4698 } |
4698 | 4699 |
4699 scoped_ptr<MediaStreamRendererFactory> | 4700 scoped_ptr<MediaStreamRendererFactory> |
4700 RenderFrameImpl::CreateRendererFactory() { | 4701 RenderFrameImpl::CreateRendererFactory() { |
4701 scoped_ptr<MediaStreamRendererFactory> factory = | 4702 scoped_ptr<MediaStreamRendererFactory> factory = |
4702 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); | 4703 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); |
4703 if (factory.get()) | 4704 if (factory.get()) |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5055 void RenderFrameImpl::RegisterMojoServices() { | 5056 void RenderFrameImpl::RegisterMojoServices() { |
5056 // Only main frame have ImageDownloader service. | 5057 // Only main frame have ImageDownloader service. |
5057 if (!frame_->parent()) { | 5058 if (!frame_->parent()) { |
5058 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5059 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
5059 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5060 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
5060 base::Unretained(this))); | 5061 base::Unretained(this))); |
5061 } | 5062 } |
5062 } | 5063 } |
5063 | 5064 |
5064 } // namespace content | 5065 } // namespace content |
OLD | NEW |