Android webview fix gpu crashes after destroy

content/browser/gpu/gpu_surface_tracker.cc

 // Copyright (c) 2012 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/gpu/gpu_surface_tracker.h"
 
 #include "base/logging.h"
 
+#if defined(OS_ANDROID)
+#include <android/native_window_jni.h>
+#endif  // defined(OS_ANDROID)

[no sievers, 2013/01/28 23:05:03]

I *think* this might belong above including logging.h, because it's an external
header.

[boliu, 2013/01/28 23:42:13]

Done.

+
 namespace content {
 
 GpuSurfaceTracker::GpuSurfaceTracker()
     : next_surface_id_(1) {
   GpuSurfaceLookup::InitInstance(this);
 }
 
 GpuSurfaceTracker::~GpuSurfaceTracker() {
   GpuSurfaceLookup::InitInstance(NULL);
 }
@@ skipping 73 matching lines @@
 
 gfx::PluginWindowHandle GpuSurfaceTracker::GetSurfaceWindowHandle(
     int surface_id) {
   base::AutoLock lock(lock_);
   SurfaceMap::iterator it = surface_map_.find(surface_id);
   if (it == surface_map_.end())
     return gfx::kNullPluginWindow;
   return it->second.handle.handle;
 }
 
 gfx::AcceleratedWidget GpuSurfaceTracker::GetNativeWidget(int surface_id) {

[no sievers, 2013/01/28 23:05:03]

Could you rename this to AcquireNativeWidget() so it hints at the fact that this
bumps the ref?

You should only have to update this class, the GpuSurfaceLookup interface, and
the one Android call site.

   base::AutoLock lock(lock_);
   SurfaceMap::iterator it = surface_map_.find(surface_id);
   if (it == surface_map_.end())
     return gfx::kNullAcceleratedWidget;
+
+#if defined(OS_ANDROID)
+  if (it->second.native_widget != gfx::kNullAcceleratedWidget)
+    ANativeWindow_acquire(it->second.native_widget);
+#endif  // defined(OS_ANDROID)
+
   return it->second.native_widget;
 }
 
 void GpuSurfaceTracker::SetNativeWidget(
     int surface_id, gfx::AcceleratedWidget widget) {
   base::AutoLock lock(lock_);
   SurfaceMap::iterator it = surface_map_.find(surface_id);
   DCHECK(it != surface_map_.end());
   it->second.native_widget = widget;
 }
 
 std::size_t GpuSurfaceTracker::GetSurfaceCount() {
   base::AutoLock lock(lock_);
   return surface_map_.size();
 }
 
 }  // namespace content