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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 #include "content/renderer/media/rtc_peer_connection_handler.h" | 171 #include "content/renderer/media/rtc_peer_connection_handler.h" |
172 #endif | 172 #endif |
173 | 173 |
174 #if defined(OS_ANDROID) | 174 #if defined(OS_ANDROID) |
175 #include <cpu-features.h> | 175 #include <cpu-features.h> |
176 | 176 |
177 #include "content/common/gpu/client/context_provider_command_buffer.h" | 177 #include "content/common/gpu/client/context_provider_command_buffer.h" |
178 #include "content/renderer/android/synchronous_compositor_factory.h" | 178 #include "content/renderer/android/synchronous_compositor_factory.h" |
179 #include "content/renderer/java/gin_java_bridge_dispatcher.h" | 179 #include "content/renderer/java/gin_java_bridge_dispatcher.h" |
180 #include "content/renderer/media/android/renderer_media_player_manager.h" | 180 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 181 #include "content/renderer/media/android/renderer_media_session_manager.h" |
181 #include "content/renderer/media/android/stream_texture_factory_impl.h" | 182 #include "content/renderer/media/android/stream_texture_factory_impl.h" |
182 #include "content/renderer/media/android/webmediaplayer_android.h" | 183 #include "content/renderer/media/android/webmediaplayer_android.h" |
183 #include "content/renderer/media/android/webmediasession_android.h" | 184 #include "content/renderer/media/android/webmediasession_android.h" |
184 #else | 185 #else |
185 #include "cc/blink/context_provider_web_context.h" | 186 #include "cc/blink/context_provider_web_context.h" |
186 #include "content/renderer/usb/web_usb_client_impl.h" | 187 #include "content/renderer/usb/web_usb_client_impl.h" |
187 #include "device/devices_app/public/cpp/constants.h" | 188 #include "device/devices_app/public/cpp/constants.h" |
188 #endif | 189 #endif |
189 | 190 |
190 #if defined(ENABLE_PEPPER_CDMS) | 191 #if defined(ENABLE_PEPPER_CDMS) |
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 cookie_jar_(this), | 737 cookie_jar_(this), |
737 selection_text_offset_(0), | 738 selection_text_offset_(0), |
738 selection_range_(gfx::Range::InvalidRange()), | 739 selection_range_(gfx::Range::InvalidRange()), |
739 handling_select_range_(false), | 740 handling_select_range_(false), |
740 notification_permission_dispatcher_(NULL), | 741 notification_permission_dispatcher_(NULL), |
741 web_user_media_client_(NULL), | 742 web_user_media_client_(NULL), |
742 media_permission_dispatcher_(NULL), | 743 media_permission_dispatcher_(NULL), |
743 midi_dispatcher_(NULL), | 744 midi_dispatcher_(NULL), |
744 #if defined(OS_ANDROID) | 745 #if defined(OS_ANDROID) |
745 media_player_manager_(NULL), | 746 media_player_manager_(NULL), |
| 747 media_session_manager_(NULL), |
746 #endif | 748 #endif |
747 #if defined(ENABLE_BROWSER_CDMS) | 749 #if defined(ENABLE_BROWSER_CDMS) |
748 cdm_manager_(NULL), | 750 cdm_manager_(NULL), |
749 #endif | 751 #endif |
750 #if defined(VIDEO_HOLE) | 752 #if defined(VIDEO_HOLE) |
751 contains_media_player_(false), | 753 contains_media_player_(false), |
752 #endif | 754 #endif |
753 devtools_agent_(nullptr), | 755 devtools_agent_(nullptr), |
754 wakelock_dispatcher_(nullptr), | 756 wakelock_dispatcher_(nullptr), |
755 geolocation_dispatcher_(NULL), | 757 geolocation_dispatcher_(NULL), |
(...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2203 // !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 2205 // !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
2204 | 2206 |
2205 return new media::WebMediaPlayerImpl( | 2207 return new media::WebMediaPlayerImpl( |
2206 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2208 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), |
2207 media_renderer_factory.Pass(), GetCdmFactory(), params); | 2209 media_renderer_factory.Pass(), GetCdmFactory(), params); |
2208 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 2210 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
2209 } | 2211 } |
2210 | 2212 |
2211 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { | 2213 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { |
2212 #if defined(OS_ANDROID) | 2214 #if defined(OS_ANDROID) |
2213 return new WebMediaSessionAndroid(); | 2215 return new WebMediaSessionAndroid(GetMediaSessionManager()); |
2214 #else | 2216 #else |
2215 return nullptr; | 2217 return nullptr; |
2216 #endif // defined(OS_ANDROID) | 2218 #endif // defined(OS_ANDROID) |
2217 } | 2219 } |
2218 | 2220 |
2219 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( | 2221 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( |
2220 blink::WebLocalFrame* frame, | 2222 blink::WebLocalFrame* frame, |
2221 blink::WebApplicationCacheHostClient* client) { | 2223 blink::WebApplicationCacheHostClient* client) { |
2222 if (!frame || !frame->view()) | 2224 if (!frame || !frame->view()) |
2223 return NULL; | 2225 return NULL; |
(...skipping 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5240 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 5242 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
5241 GetMediaPlayerManager(), GetCdmFactory(), | 5243 GetMediaPlayerManager(), GetCdmFactory(), |
5242 stream_texture_factory, params); | 5244 stream_texture_factory, params); |
5243 } | 5245 } |
5244 | 5246 |
5245 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { | 5247 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |
5246 if (!media_player_manager_) | 5248 if (!media_player_manager_) |
5247 media_player_manager_ = new RendererMediaPlayerManager(this); | 5249 media_player_manager_ = new RendererMediaPlayerManager(this); |
5248 return media_player_manager_; | 5250 return media_player_manager_; |
5249 } | 5251 } |
| 5252 |
| 5253 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() { |
| 5254 if (!media_session_manager_) |
| 5255 media_session_manager_ = new RendererMediaSessionManager(this); |
| 5256 return media_session_manager_; |
| 5257 } |
| 5258 |
5250 #endif // defined(OS_ANDROID) | 5259 #endif // defined(OS_ANDROID) |
5251 | 5260 |
5252 scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( | 5261 scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( |
5253 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) { | 5262 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) { |
5254 MediaPermissionDispatcherImpl* media_permission = | 5263 MediaPermissionDispatcherImpl* media_permission = |
5255 static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission()); | 5264 static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission()); |
5256 return media_permission->CreateProxy(caller_task_runner).Pass(); | 5265 return media_permission->CreateProxy(caller_task_runner).Pass(); |
5257 } | 5266 } |
5258 | 5267 |
5259 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { | 5268 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5343 } | 5352 } |
5344 | 5353 |
5345 media::RendererWebMediaPlayerDelegate* | 5354 media::RendererWebMediaPlayerDelegate* |
5346 RenderFrameImpl::GetWebMediaPlayerDelegate() { | 5355 RenderFrameImpl::GetWebMediaPlayerDelegate() { |
5347 if (!media_player_delegate_) | 5356 if (!media_player_delegate_) |
5348 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); | 5357 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); |
5349 return media_player_delegate_; | 5358 return media_player_delegate_; |
5350 } | 5359 } |
5351 | 5360 |
5352 } // namespace content | 5361 } // namespace content |
OLD | NEW |