Plumb a Browser->GPU surface destruction message for Android VDAs

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 "content/browser/android/child_process_launcher_android.h"
 #include "content/browser/android/content_view_core_impl.h"
+#include "content/browser/gpu/gpu_process_host_ui_shim.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 "media/base/surface_manager.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace content {
 
 BrowserSurfaceViewManager::BrowserSurfaceViewManager(
     RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host),
       surface_id_(media::SurfaceManager::kNoSurfaceID) {}
 
 BrowserSurfaceViewManager::~BrowserSurfaceViewManager() {}
 
 void BrowserSurfaceViewManager::SetVideoSurface(
     gfx::ScopedJavaSurface surface) {
   if (surface.IsEmpty()) {
     DCHECK_NE(surface_id_, media::SurfaceManager::kNoSurfaceID);
     GpuSurfaceTracker::Get()->RemoveSurface(surface_id_);
     UnregisterViewSurface(surface_id_);
+    // Only send the surface destruction message on JB, where not doing it can
+    // cause crashes.
+    if (base::android::BuildInfo::GetInstance()->sdk_int() < 18)
+      SendDestroyingVideoSurface(surface_id_);
     surface_id_ = media::SurfaceManager::kNoSurfaceID;
   } else {
     // We mainly use the surface tracker to allocate a surface id for us. The
     // lookup will go through the Android specific path and get the java
     // surface directly, so there's no need to add a valid native widget here.
     surface_id_ = GpuSurfaceTracker::Get()->AddSurfaceForNativeWidget(
         gfx::kNullAcceleratedWidget);
     RegisterViewSurface(surface_id_, surface.j_surface().obj());
     SendSurfaceID(surface_id_);
   }
@@ skipping 35 matching lines @@
   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(
           render_frame_host_->GetRoutingID(), surface_id));
 }
 
+void BrowserSurfaceViewManager::SendDestroyingVideoSurface(int surface_id) {
+  TRACE_EVENT0("media",
+               "BrowserSurfaceViewManager::SendDestroyingVideoSurface");
+  // XXX: How do we loop over all instances?

[no sievers, 2016/04/19 23:30:17]

Can you move the thread bouncing code from GpuProcessHostUIShim into here, and
then just call the following to get to GpuProcessHost?

GpuProcessHost::Get(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,                 
               CAUSE_FOR_GPU_LAUNCH_NO_LAUNCH);

^^ and you can use NO_LAUNCH since if it's not there, then it won't know about
this Surface anyhow.

[watk, 2016/04/22 02:48:55]

Done. This is much better

+  GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
+  base::WaitableEvent waiter(false, false);
+  // Unretained is okay because we're waiting on the callback below.
+  shim->DestroyingVideoSurface(
+      surface_id,
+      base::Bind(&base::WaitableEvent::Signal, base::Unretained(&waiter)));
+  base::ThreadRestrictions::ScopedAllowWait allow_wait;
+  waiter.Wait();
+}
+
 }  // namespace content