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

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

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: rebase onto new mojo types 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
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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 #if defined(ENABLE_WEBRTC) 212 #if defined(ENABLE_WEBRTC)
213 #include "content/renderer/media/rtc_peer_connection_handler.h" 213 #include "content/renderer/media/rtc_peer_connection_handler.h"
214 #endif 214 #endif
215 215
216 #if defined(OS_ANDROID) 216 #if defined(OS_ANDROID)
217 #include <cpu-features.h> 217 #include <cpu-features.h>
218 218
219 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 219 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
220 #include "content/renderer/media/android/renderer_media_player_manager.h" 220 #include "content/renderer/media/android/renderer_media_player_manager.h"
221 #include "content/renderer/media/android/renderer_media_session_manager.h"
222 #include "content/renderer/media/android/renderer_surface_view_manager.h" 221 #include "content/renderer/media/android/renderer_surface_view_manager.h"
223 #include "content/renderer/media/android/stream_texture_factory.h" 222 #include "content/renderer/media/android/stream_texture_factory.h"
224 #include "content/renderer/media/android/webmediaplayer_android.h" 223 #include "content/renderer/media/android/webmediaplayer_android.h"
225 #include "content/renderer/media/android/webmediasession_android.h"
226 #include "media/base/android/media_codec_util.h" 224 #include "media/base/android/media_codec_util.h"
227 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 225 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
228 #endif 226 #endif
229 227
230 #if defined(ENABLE_PEPPER_CDMS) 228 #if defined(ENABLE_PEPPER_CDMS)
231 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 229 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
232 #include "content/renderer/media/cdm/render_cdm_factory.h" 230 #include "content/renderer/media/cdm/render_cdm_factory.h"
233 #elif defined(ENABLE_BROWSER_CDMS) 231 #elif defined(ENABLE_BROWSER_CDMS)
234 #include "content/renderer/media/cdm/render_cdm_factory.h" 232 #include "content/renderer/media/cdm/render_cdm_factory.h"
235 #include "content/renderer/media/cdm/renderer_cdm_manager.h" 233 #include "content/renderer/media/cdm/renderer_cdm_manager.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 using blink::WebFrame; 267 using blink::WebFrame;
270 using blink::WebFrameLoadType; 268 using blink::WebFrameLoadType;
271 using blink::WebFrameSerializer; 269 using blink::WebFrameSerializer;
272 using blink::WebFrameSerializerClient; 270 using blink::WebFrameSerializerClient;
273 using blink::WebHistoryItem; 271 using blink::WebHistoryItem;
274 using blink::WebHTTPBody; 272 using blink::WebHTTPBody;
275 using blink::WebLocalFrame; 273 using blink::WebLocalFrame;
276 using blink::WebMediaPlayer; 274 using blink::WebMediaPlayer;
277 using blink::WebMediaPlayerClient; 275 using blink::WebMediaPlayerClient;
278 using blink::WebMediaPlayerEncryptedMediaClient; 276 using blink::WebMediaPlayerEncryptedMediaClient;
279 using blink::WebMediaSession;
280 using blink::WebNavigationPolicy; 277 using blink::WebNavigationPolicy;
281 using blink::WebNavigationType; 278 using blink::WebNavigationType;
282 using blink::WebNode; 279 using blink::WebNode;
283 using blink::WebPluginDocument; 280 using blink::WebPluginDocument;
284 using blink::WebPluginParams; 281 using blink::WebPluginParams;
285 using blink::WebPoint; 282 using blink::WebPoint;
286 using blink::WebPopupMenuInfo; 283 using blink::WebPopupMenuInfo;
287 using blink::WebRange; 284 using blink::WebRange;
288 using blink::WebRect; 285 using blink::WebRect;
289 using blink::WebReferrerPolicy; 286 using blink::WebReferrerPolicy;
(...skipping 2420 matching lines...) Expand 10 before | Expand all | Expand 10 after
2710 std::move(media_renderer_factory), url_index_, params); 2707 std::move(media_renderer_factory), url_index_, params);
2711 2708
2712 #if defined(OS_ANDROID) // WMPI_CAST 2709 #if defined(OS_ANDROID) // WMPI_CAST
2713 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2710 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2714 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2711 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2715 #endif 2712 #endif
2716 2713
2717 return media_player; 2714 return media_player;
2718 } 2715 }
2719 2716
2720 blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
2721 #if defined(OS_ANDROID)
2722 return new WebMediaSessionAndroid(GetMediaSessionManager());
2723 #else
2724 return nullptr;
2725 #endif // defined(OS_ANDROID)
2726 }
2727
2728 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2717 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2729 blink::WebApplicationCacheHostClient* client) { 2718 blink::WebApplicationCacheHostClient* client) {
2730 if (!frame_ || !frame_->view()) 2719 if (!frame_ || !frame_->view())
2731 return NULL; 2720 return NULL;
2732 return new RendererWebApplicationCacheHostImpl( 2721 return new RendererWebApplicationCacheHostImpl(
2733 RenderViewImpl::FromWebView(frame_->view()), client, 2722 RenderViewImpl::FromWebView(frame_->view()), client,
2734 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); 2723 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
2735 } 2724 }
2736 2725
2737 blink::WebWorkerContentSettingsClientProxy* 2726 blink::WebWorkerContentSettingsClientProxy*
(...skipping 3453 matching lines...) Expand 10 before | Expand all | Expand 10 after
6191 GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(), 6180 GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(),
6192 stream_texture_factory, routing_id_, enable_texture_copy, params); 6181 stream_texture_factory, routing_id_, enable_texture_copy, params);
6193 } 6182 }
6194 6183
6195 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { 6184 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
6196 if (!media_player_manager_) 6185 if (!media_player_manager_)
6197 media_player_manager_ = new RendererMediaPlayerManager(this); 6186 media_player_manager_ = new RendererMediaPlayerManager(this);
6198 return media_player_manager_; 6187 return media_player_manager_;
6199 } 6188 }
6200 6189
6201 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
6202 if (!media_session_manager_)
6203 media_session_manager_ = new RendererMediaSessionManager(this);
6204 return media_session_manager_;
6205 }
6206
6207 #endif // defined(OS_ANDROID) 6190 #endif // defined(OS_ANDROID)
6208 6191
6209 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { 6192 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
6210 if (!media_permission_dispatcher_) { 6193 if (!media_permission_dispatcher_) {
6211 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind( 6194 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
6212 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>, 6195 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>,
6213 base::Unretained(this)))); 6196 base::Unretained(this))));
6214 } 6197 }
6215 return media_permission_dispatcher_.get(); 6198 return media_permission_dispatcher_.get();
6216 } 6199 }
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
6442 // event target. Potentially a Pepper plugin will receive the event. 6425 // event target. Potentially a Pepper plugin will receive the event.
6443 // In order to tell whether a plugin gets the last mouse event and which it 6426 // In order to tell whether a plugin gets the last mouse event and which it
6444 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6427 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6445 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6428 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6446 // |pepper_last_mouse_event_target_|. 6429 // |pepper_last_mouse_event_target_|.
6447 pepper_last_mouse_event_target_ = nullptr; 6430 pepper_last_mouse_event_target_ = nullptr;
6448 #endif 6431 #endif
6449 } 6432 }
6450 6433
6451 } // namespace content 6434 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698