Enable SurfaceView fullscreen video on Android with WebMediaPlayerImpl

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 185 matching lines @@
 #endif
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/renderer_media_session_manager.h"
+#include "content/renderer/media/android/renderer_surface_view_manager.h"
 #include "content/renderer/media/android/stream_texture_factory_impl.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #include "content/renderer/media/android/webmediasession_android.h"
 #include "media/base/android/media_codec_util.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #else
 #include "cc/blink/context_provider_web_context.h"
 #include "device/devices_app/public/cpp/constants.h"
 #endif
 
@@ skipping 757 matching lines @@
       selection_text_offset_(0),
       selection_range_(gfx::Range::InvalidRange()),
       handling_select_range_(false),
       notification_permission_dispatcher_(NULL),
       web_user_media_client_(NULL),
       media_permission_dispatcher_(NULL),
       midi_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       media_player_manager_(NULL),
       media_session_manager_(NULL),
+      media_surface_manager_(nullptr),
 #endif
 #if defined(ENABLE_BROWSER_CDMS)
       cdm_manager_(NULL),
 #endif
 #if defined(VIDEO_HOLE)
       contains_media_player_(false),
 #endif
       devtools_agent_(nullptr),
       wakelock_dispatcher_(nullptr),
       geolocation_dispatcher_(NULL),
@@ skipping 1511 matching lines @@
   }
 #endif  // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID)
 
   if (!url_index_.get() || url_index_->frame() != frame)
     url_index_.reset(new media::UrlIndex(frame));
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
       std::move(media_renderer_factory), GetCdmFactory(), url_index_, params);
 
-#if defined(OS_ANDROID)  // WMPI_CAST
+#if defined(OS_ANDROID)
+  media_player->SetSurfaceManager(GetSurfaceManager());
+  // WMPI_CAST
   media_player->SetMediaPlayerManager(GetMediaPlayerManager());
   media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
 #endif
 
   return media_player;
 }
 
 blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
 #if defined(OS_ANDROID)
   return new WebMediaSessionAndroid(GetMediaSessionManager());
@@ skipping 3426 matching lines @@
     media_player_manager_ = new RendererMediaPlayerManager(this);
   return media_player_manager_;
 }
 
 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
   if (!media_session_manager_)
     media_session_manager_ = new RendererMediaSessionManager(this);
   return media_session_manager_;
 }
 
+media::SurfaceManager* RenderFrameImpl::GetSurfaceManager() {
+  if (!media_surface_manager_)
+    media_surface_manager_ = new RendererSurfaceViewManager(this);
+  return media_surface_manager_;
+}
 #endif  // defined(OS_ANDROID)
 
 scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) {
   MediaPermissionDispatcherImpl* media_permission =
       static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission());
   return media_permission->CreateProxy(caller_task_runner);
 }
 
 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
@@ skipping 126 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content