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

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

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: blink typemap (need to revert blink typemap, only need content/ reivew) 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 #endif 231 #endif
234 232
235 #if defined(ENABLE_MOJO_MEDIA) 233 #if defined(ENABLE_MOJO_MEDIA)
(...skipping 30 matching lines...) Expand all
266 using blink::WebFrame; 264 using blink::WebFrame;
267 using blink::WebFrameLoadType; 265 using blink::WebFrameLoadType;
268 using blink::WebFrameSerializer; 266 using blink::WebFrameSerializer;
269 using blink::WebFrameSerializerClient; 267 using blink::WebFrameSerializerClient;
270 using blink::WebHistoryItem; 268 using blink::WebHistoryItem;
271 using blink::WebHTTPBody; 269 using blink::WebHTTPBody;
272 using blink::WebLocalFrame; 270 using blink::WebLocalFrame;
273 using blink::WebMediaPlayer; 271 using blink::WebMediaPlayer;
274 using blink::WebMediaPlayerClient; 272 using blink::WebMediaPlayerClient;
275 using blink::WebMediaPlayerEncryptedMediaClient; 273 using blink::WebMediaPlayerEncryptedMediaClient;
276 using blink::WebMediaSession;
277 using blink::WebNavigationPolicy; 274 using blink::WebNavigationPolicy;
278 using blink::WebNavigationType; 275 using blink::WebNavigationType;
279 using blink::WebNode; 276 using blink::WebNode;
280 using blink::WebPluginDocument; 277 using blink::WebPluginDocument;
281 using blink::WebPluginParams; 278 using blink::WebPluginParams;
282 using blink::WebPoint; 279 using blink::WebPoint;
283 using blink::WebPopupMenuInfo; 280 using blink::WebPopupMenuInfo;
284 using blink::WebRange; 281 using blink::WebRange;
285 using blink::WebRect; 282 using blink::WebRect;
286 using blink::WebReferrerPolicy; 283 using blink::WebReferrerPolicy;
(...skipping 2416 matching lines...) Expand 10 before | Expand all | Expand 10 after
2703 std::move(media_renderer_factory), url_index_, params); 2700 std::move(media_renderer_factory), url_index_, params);
2704 2701
2705 #if defined(OS_ANDROID) // WMPI_CAST 2702 #if defined(OS_ANDROID) // WMPI_CAST
2706 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2703 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2707 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2704 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2708 #endif 2705 #endif
2709 2706
2710 return media_player; 2707 return media_player;
2711 } 2708 }
2712 2709
2713 blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
2714 #if defined(OS_ANDROID)
2715 return new WebMediaSessionAndroid(GetMediaSessionManager());
2716 #else
2717 return nullptr;
2718 #endif // defined(OS_ANDROID)
2719 }
2720
2721 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2710 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2722 blink::WebApplicationCacheHostClient* client) { 2711 blink::WebApplicationCacheHostClient* client) {
2723 if (!frame_ || !frame_->view()) 2712 if (!frame_ || !frame_->view())
2724 return NULL; 2713 return NULL;
2725 return new RendererWebApplicationCacheHostImpl( 2714 return new RendererWebApplicationCacheHostImpl(
2726 RenderViewImpl::FromWebView(frame_->view()), client, 2715 RenderViewImpl::FromWebView(frame_->view()), client,
2727 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); 2716 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
2728 } 2717 }
2729 2718
2730 blink::WebWorkerContentSettingsClientProxy* 2719 blink::WebWorkerContentSettingsClientProxy*
(...skipping 3452 matching lines...) Expand 10 before | Expand all | Expand 10 after
6183 GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(), 6172 GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(),
6184 stream_texture_factory, routing_id_, enable_texture_copy, params); 6173 stream_texture_factory, routing_id_, enable_texture_copy, params);
6185 } 6174 }
6186 6175
6187 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { 6176 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
6188 if (!media_player_manager_) 6177 if (!media_player_manager_)
6189 media_player_manager_ = new RendererMediaPlayerManager(this); 6178 media_player_manager_ = new RendererMediaPlayerManager(this);
6190 return media_player_manager_; 6179 return media_player_manager_;
6191 } 6180 }
6192 6181
6193 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
6194 if (!media_session_manager_)
6195 media_session_manager_ = new RendererMediaSessionManager(this);
6196 return media_session_manager_;
6197 }
6198
6199 #endif // defined(OS_ANDROID) 6182 #endif // defined(OS_ANDROID)
6200 6183
6201 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { 6184 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
6202 if (!media_permission_dispatcher_) { 6185 if (!media_permission_dispatcher_) {
6203 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind( 6186 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
6204 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>, 6187 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>,
6205 base::Unretained(this)))); 6188 base::Unretained(this))));
6206 } 6189 }
6207 return media_permission_dispatcher_.get(); 6190 return media_permission_dispatcher_.get();
6208 } 6191 }
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
6430 // event target. Potentially a Pepper plugin will receive the event. 6413 // event target. Potentially a Pepper plugin will receive the event.
6431 // In order to tell whether a plugin gets the last mouse event and which it 6414 // In order to tell whether a plugin gets the last mouse event and which it
6432 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6415 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6433 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6416 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6434 // |pepper_last_mouse_event_target_|. 6417 // |pepper_last_mouse_event_target_|.
6435 pepper_last_mouse_event_target_ = nullptr; 6418 pepper_last_mouse_event_target_ = nullptr;
6436 #endif 6419 #endif
6437 } 6420 }
6438 6421
6439 } // namespace content 6422 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698