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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 | 168 |
169 #if defined(OS_ANDROID) | 169 #if defined(OS_ANDROID) |
170 #include <cpu-features.h> | 170 #include <cpu-features.h> |
171 | 171 |
172 #include "content/common/gpu/client/context_provider_command_buffer.h" | 172 #include "content/common/gpu/client/context_provider_command_buffer.h" |
173 #include "content/renderer/android/synchronous_compositor_factory.h" | 173 #include "content/renderer/android/synchronous_compositor_factory.h" |
174 #include "content/renderer/java/gin_java_bridge_dispatcher.h" | 174 #include "content/renderer/java/gin_java_bridge_dispatcher.h" |
175 #include "content/renderer/media/android/renderer_media_player_manager.h" | 175 #include "content/renderer/media/android/renderer_media_player_manager.h" |
176 #include "content/renderer/media/android/stream_texture_factory_impl.h" | 176 #include "content/renderer/media/android/stream_texture_factory_impl.h" |
177 #include "content/renderer/media/android/webmediaplayer_android.h" | 177 #include "content/renderer/media/android/webmediaplayer_android.h" |
| 178 #include "content/renderer/media/android/webmediasession_android.h" |
178 #else | 179 #else |
179 #include "cc/blink/context_provider_web_context.h" | 180 #include "cc/blink/context_provider_web_context.h" |
180 #include "content/renderer/usb/web_usb_client_impl.h" | 181 #include "content/renderer/usb/web_usb_client_impl.h" |
181 #include "device/devices_app/public/cpp/constants.h" | 182 #include "device/devices_app/public/cpp/constants.h" |
182 #endif | 183 #endif |
183 | 184 |
184 #if defined(ENABLE_PEPPER_CDMS) | 185 #if defined(ENABLE_PEPPER_CDMS) |
185 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" | 186 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" |
186 #elif defined(ENABLE_BROWSER_CDMS) | 187 #elif defined(ENABLE_BROWSER_CDMS) |
187 #include "content/renderer/media/crypto/renderer_cdm_manager.h" | 188 #include "content/renderer/media/crypto/renderer_cdm_manager.h" |
(...skipping 24 matching lines...) Expand all Loading... |
212 using blink::WebElement; | 213 using blink::WebElement; |
213 using blink::WebExternalPopupMenu; | 214 using blink::WebExternalPopupMenu; |
214 using blink::WebExternalPopupMenuClient; | 215 using blink::WebExternalPopupMenuClient; |
215 using blink::WebFrame; | 216 using blink::WebFrame; |
216 using blink::WebHistoryItem; | 217 using blink::WebHistoryItem; |
217 using blink::WebHTTPBody; | 218 using blink::WebHTTPBody; |
218 using blink::WebLocalFrame; | 219 using blink::WebLocalFrame; |
219 using blink::WebMediaPlayer; | 220 using blink::WebMediaPlayer; |
220 using blink::WebMediaPlayerClient; | 221 using blink::WebMediaPlayerClient; |
221 using blink::WebMediaPlayerEncryptedMediaClient; | 222 using blink::WebMediaPlayerEncryptedMediaClient; |
| 223 using blink::WebMediaSession; |
222 using blink::WebNavigationPolicy; | 224 using blink::WebNavigationPolicy; |
223 using blink::WebNavigationType; | 225 using blink::WebNavigationType; |
224 using blink::WebNode; | 226 using blink::WebNode; |
225 using blink::WebPageSerializer; | 227 using blink::WebPageSerializer; |
226 using blink::WebPageSerializerClient; | 228 using blink::WebPageSerializerClient; |
227 using blink::WebPluginParams; | 229 using blink::WebPluginParams; |
228 using blink::WebPopupMenuInfo; | 230 using blink::WebPopupMenuInfo; |
229 using blink::WebRange; | 231 using blink::WebRange; |
230 using blink::WebReferrerPolicy; | 232 using blink::WebReferrerPolicy; |
231 using blink::WebScriptSource; | 233 using blink::WebScriptSource; |
(...skipping 1888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2120 *render_thread->GetAudioHardwareConfig())); | 2122 *render_thread->GetAudioHardwareConfig())); |
2121 } | 2123 } |
2122 #endif // defined(ENABLE_MOJO_MEDIA) | 2124 #endif // defined(ENABLE_MOJO_MEDIA) |
2123 | 2125 |
2124 return new media::WebMediaPlayerImpl( | 2126 return new media::WebMediaPlayerImpl( |
2125 frame, client, encrypted_client, weak_factory_.GetWeakPtr(), | 2127 frame, client, encrypted_client, weak_factory_.GetWeakPtr(), |
2126 media_renderer_factory.Pass(), GetCdmFactory(), params); | 2128 media_renderer_factory.Pass(), GetCdmFactory(), params); |
2127 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 2129 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
2128 } | 2130 } |
2129 | 2131 |
| 2132 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { |
| 2133 #if defined(OS_ANDROID) |
| 2134 return new WebMediaSessionAndroid(); |
| 2135 #else |
| 2136 return nullptr; |
| 2137 #endif // defined(OS_ANDROID) |
| 2138 } |
| 2139 |
2130 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( | 2140 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( |
2131 blink::WebLocalFrame* frame, | 2141 blink::WebLocalFrame* frame, |
2132 blink::WebApplicationCacheHostClient* client) { | 2142 blink::WebApplicationCacheHostClient* client) { |
2133 if (!frame || !frame->view()) | 2143 if (!frame || !frame->view()) |
2134 return NULL; | 2144 return NULL; |
2135 DCHECK(!frame_ || frame_ == frame); | 2145 DCHECK(!frame_ || frame_ == frame); |
2136 return new RendererWebApplicationCacheHostImpl( | 2146 return new RendererWebApplicationCacheHostImpl( |
2137 RenderViewImpl::FromWebView(frame->view()), client, | 2147 RenderViewImpl::FromWebView(frame->view()), client, |
2138 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); | 2148 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); |
2139 } | 2149 } |
(...skipping 3056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5196 mojo::ServiceProviderPtr service_provider(21); | 5206 mojo::ServiceProviderPtr service_provider(21); |
5197 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5207 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5198 request->url = mojo::String::From(url); | 5208 request->url = mojo::String::From(url); |
5199 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5209 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5200 nullptr, nullptr, | 5210 nullptr, nullptr, |
5201 base::Bind(&OnGotContentHandlerID)); | 5211 base::Bind(&OnGotContentHandlerID)); |
5202 return service_provider.Pass(); | 5212 return service_provider.Pass(); |
5203 } | 5213 } |
5204 | 5214 |
5205 } // namespace content | 5215 } // namespace content |
OLD | NEW |