| 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 3788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3799 context_provider, gpu_channel_host, routing_id_); | 3799 context_provider, gpu_channel_host, routing_id_); |
| 3800 } | 3800 } |
| 3801 | 3801 |
| 3802 return new WebMediaPlayerAndroid( | 3802 return new WebMediaPlayerAndroid( |
| 3803 frame_, | 3803 frame_, |
| 3804 client, | 3804 client, |
| 3805 weak_factory_.GetWeakPtr(), | 3805 weak_factory_.GetWeakPtr(), |
| 3806 GetMediaPlayerManager(), | 3806 GetMediaPlayerManager(), |
| 3807 GetCdmManager(), | 3807 GetCdmManager(), |
| 3808 stream_texture_factory, | 3808 stream_texture_factory, |
| 3809 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 3809 RenderThreadImpl::current()->GetMediaThreadTaskRunner(), |
| 3810 new RenderMediaLog()); | 3810 new RenderMediaLog()); |
| 3811 } | 3811 } |
| 3812 | 3812 |
| 3813 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { | 3813 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |
| 3814 if (!media_player_manager_) | 3814 if (!media_player_manager_) |
| 3815 media_player_manager_ = new RendererMediaPlayerManager(this); | 3815 media_player_manager_ = new RendererMediaPlayerManager(this); |
| 3816 return media_player_manager_; | 3816 return media_player_manager_; |
| 3817 } | 3817 } |
| 3818 | 3818 |
| 3819 #endif // defined(OS_ANDROID) | 3819 #endif // defined(OS_ANDROID) |
| 3820 | 3820 |
| 3821 #if defined(ENABLE_BROWSER_CDMS) | 3821 #if defined(ENABLE_BROWSER_CDMS) |
| 3822 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3822 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3823 if (!cdm_manager_) | 3823 if (!cdm_manager_) |
| 3824 cdm_manager_ = new RendererCdmManager(this); | 3824 cdm_manager_ = new RendererCdmManager(this); |
| 3825 return cdm_manager_; | 3825 return cdm_manager_; |
| 3826 } | 3826 } |
| 3827 #endif // defined(ENABLE_BROWSER_CDMS) | 3827 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3828 | 3828 |
| 3829 } // namespace content | 3829 } // namespace content |
| OLD | NEW |