Refactor ContentViewClient (1/6)

content/browser/media/android/browser_surface_view_manager.cc

 // Copyright 2016 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/browser/media/android/browser_surface_view_manager.h"
 
 #include "base/android/build_info.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/android/child_process_launcher_android.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/media/surface_view_manager_messages_android.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "media/base/surface_manager.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace content {
 namespace {
 void SendDestroyingVideoSurfaceOnIO(int surface_id,
                                     const base::Closure& done_cb) {
   GpuProcessHost* host = GpuProcessHost::Get(
       GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, false /* force_create */);
   if (host)
@@ skipping 48 matching lines @@
     }
   }
 
   // If we don't own the fullscreen view, but one exists, it means another
   // WebContents has it. Ignore this request and return a null surface id.
   if (ContentVideoView::GetInstance()) {
     SendSurfaceID(media::SurfaceManager::kNoSurfaceID);
     return;
   }
 
-  ContentViewCore* cvc = ContentViewCore::FromWebContents(
-      WebContents::FromRenderFrameHost(render_frame_host_));
+  WebContents* web_contents =
+      WebContents::FromRenderFrameHost(render_frame_host_);
+  ContentViewCore* cvc = ContentViewCore::FromWebContents(web_contents);
   content_video_view_.reset(
-      new ContentVideoView(this, cvc, video_natural_size));
+      new ContentVideoView(this, cvc,
+          web_contents->GetDelegate()->GetContentVideoViewEmbedder(),

[boliu, 2016/09/26 21:25:25]

null check GetDelegate

[Jinsuk Kim, 2016/09/27 10:08:59]

Done.

+          video_natural_size));
 }
 
 void BrowserSurfaceViewManager::OnNaturalSizeChanged(const gfx::Size& size) {
   if (content_video_view_)
     content_video_view_->OnVideoSizeChanged(size.width(), size.height());
 }
 
 bool BrowserSurfaceViewManager::SendSurfaceID(int surface_id) {
   return render_frame_host_->Send(
       new SurfaceViewManagerMsg_FullscreenSurfaceCreated(
@@ skipping 14 matching lines @@
           BrowserThread::IO, FROM_HERE,
           base::Bind(&SendDestroyingVideoSurfaceOnIO, surface_id,
                      base::Bind(&base::WaitableEvent::Signal,
                                 base::Unretained(&waiter))))) {
     base::ThreadRestrictions::ScopedAllowWait allow_wait;
     waiter.Wait();
   }
 }
 
 }  // namespace content