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"
 
+#if defined(OS_ANDROID)
+#include <android/native_window_jni.h>
+#endif  // defined(OS_ANDROID)
+
 #include "base/logging.h"
 
 namespace content {
 
 GpuSurfaceTracker::GpuSurfaceTracker()
     : next_surface_id_(1) {
   GpuSurfaceLookup::InitInstance(this);
 }
 
 GpuSurfaceTracker::~GpuSurfaceTracker() {
@@ skipping 75 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) {
+gfx::AcceleratedWidget GpuSurfaceTracker::AcquireNativeWidget(int surface_id) {
   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