Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: fixed layout tests Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 #if defined(ENABLE_WEBRTC) 214 #if defined(ENABLE_WEBRTC)
215 #include "content/renderer/media/rtc_peer_connection_handler.h" 215 #include "content/renderer/media/rtc_peer_connection_handler.h"
216 #endif 216 #endif
217 217
218 #if defined(OS_ANDROID) 218 #if defined(OS_ANDROID)
219 #include <cpu-features.h> 219 #include <cpu-features.h>
220 220
221 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 221 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
222 #include "content/renderer/media/android/renderer_media_player_manager.h" 222 #include "content/renderer/media/android/renderer_media_player_manager.h"
223 #include "content/renderer/media/android/renderer_media_session_manager.h"
224 #include "content/renderer/media/android/renderer_surface_view_manager.h" 223 #include "content/renderer/media/android/renderer_surface_view_manager.h"
225 #include "content/renderer/media/android/stream_texture_factory.h" 224 #include "content/renderer/media/android/stream_texture_factory.h"
226 #include "content/renderer/media/android/webmediaplayer_android.h" 225 #include "content/renderer/media/android/webmediaplayer_android.h"
227 #include "content/renderer/media/android/webmediasession_android.h"
228 #include "media/base/android/media_codec_util.h" 226 #include "media/base/android/media_codec_util.h"
229 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 227 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
230 #endif 228 #endif
231 229
232 #if defined(ENABLE_PEPPER_CDMS) 230 #if defined(ENABLE_PEPPER_CDMS)
233 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 231 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
234 #include "content/renderer/media/cdm/render_cdm_factory.h" 232 #include "content/renderer/media/cdm/render_cdm_factory.h"
235 #endif 233 #endif
236 234
237 #if defined(ENABLE_MOJO_MEDIA) 235 #if defined(ENABLE_MOJO_MEDIA)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 using blink::WebFrame; 268 using blink::WebFrame;
271 using blink::WebFrameLoadType; 269 using blink::WebFrameLoadType;
272 using blink::WebFrameSerializer; 270 using blink::WebFrameSerializer;
273 using blink::WebFrameSerializerClient; 271 using blink::WebFrameSerializerClient;
274 using blink::WebHistoryItem; 272 using blink::WebHistoryItem;
275 using blink::WebHTTPBody; 273 using blink::WebHTTPBody;
276 using blink::WebLocalFrame; 274 using blink::WebLocalFrame;
277 using blink::WebMediaPlayer; 275 using blink::WebMediaPlayer;
278 using blink::WebMediaPlayerClient; 276 using blink::WebMediaPlayerClient;
279 using blink::WebMediaPlayerEncryptedMediaClient; 277 using blink::WebMediaPlayerEncryptedMediaClient;
280 using blink::WebMediaSession;
281 using blink::WebNavigationPolicy; 278 using blink::WebNavigationPolicy;
282 using blink::WebNavigationType; 279 using blink::WebNavigationType;
283 using blink::WebNode; 280 using blink::WebNode;
284 using blink::WebPluginDocument; 281 using blink::WebPluginDocument;
285 using blink::WebPluginParams; 282 using blink::WebPluginParams;
286 using blink::WebPoint; 283 using blink::WebPoint;
287 using blink::WebPopupMenuInfo; 284 using blink::WebPopupMenuInfo;
288 using blink::WebRange; 285 using blink::WebRange;
289 using blink::WebRect; 286 using blink::WebRect;
290 using blink::WebReferrerPolicy; 287 using blink::WebReferrerPolicy;
(...skipping 2444 matching lines...) Expand 10 before | Expand all | Expand 10 after
2735 std::move(media_renderer_factory), url_index_, params); 2732 std::move(media_renderer_factory), url_index_, params);
2736 2733
2737 #if defined(OS_ANDROID) // WMPI_CAST 2734 #if defined(OS_ANDROID) // WMPI_CAST
2738 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2735 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2739 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2736 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2740 #endif 2737 #endif
2741 2738
2742 return media_player; 2739 return media_player;
2743 } 2740 }
2744 2741
2745 blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
2746 #if defined(OS_ANDROID)
2747 return new WebMediaSessionAndroid(GetMediaSessionManager());
2748 #else
2749 return nullptr;
2750 #endif // defined(OS_ANDROID)
2751 }
2752
2753 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2742 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2754 blink::WebApplicationCacheHostClient* client) { 2743 blink::WebApplicationCacheHostClient* client) {
2755 if (!frame_ || !frame_->view()) 2744 if (!frame_ || !frame_->view())
2756 return NULL; 2745 return NULL;
2757 return new RendererWebApplicationCacheHostImpl( 2746 return new RendererWebApplicationCacheHostImpl(
2758 RenderViewImpl::FromWebView(frame_->view()), client, 2747 RenderViewImpl::FromWebView(frame_->view()), client,
2759 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); 2748 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
2760 } 2749 }
2761 2750
2762 blink::WebWorkerContentSettingsClientProxy* 2751 blink::WebWorkerContentSettingsClientProxy*
(...skipping 3500 matching lines...) Expand 10 before | Expand all | Expand 10 after
6263 GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(), 6252 GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(),
6264 stream_texture_factory, routing_id_, enable_texture_copy, params); 6253 stream_texture_factory, routing_id_, enable_texture_copy, params);
6265 } 6254 }
6266 6255
6267 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { 6256 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
6268 if (!media_player_manager_) 6257 if (!media_player_manager_)
6269 media_player_manager_ = new RendererMediaPlayerManager(this); 6258 media_player_manager_ = new RendererMediaPlayerManager(this);
6270 return media_player_manager_; 6259 return media_player_manager_;
6271 } 6260 }
6272 6261
6273 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
6274 if (!media_session_manager_)
6275 media_session_manager_ = new RendererMediaSessionManager(this);
6276 return media_session_manager_;
6277 }
6278
6279 #endif // defined(OS_ANDROID) 6262 #endif // defined(OS_ANDROID)
6280 6263
6281 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { 6264 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
6282 if (!media_permission_dispatcher_) { 6265 if (!media_permission_dispatcher_) {
6283 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind( 6266 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
6284 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>, 6267 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>,
6285 base::Unretained(this)))); 6268 base::Unretained(this))));
6286 } 6269 }
6287 return media_permission_dispatcher_.get(); 6270 return media_permission_dispatcher_.get();
6288 } 6271 }
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
6510 // event target. Potentially a Pepper plugin will receive the event. 6493 // event target. Potentially a Pepper plugin will receive the event.
6511 // In order to tell whether a plugin gets the last mouse event and which it 6494 // In order to tell whether a plugin gets the last mouse event and which it
6512 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6495 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6513 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6496 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6514 // |pepper_last_mouse_event_target_|. 6497 // |pepper_last_mouse_event_target_|.
6515 pepper_last_mouse_event_target_ = nullptr; 6498 pepper_last_mouse_event_target_ = nullptr;
6516 #endif 6499 #endif
6517 } 6500 }
6518 6501
6519 } // namespace content 6502 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698