Android webview fix gpu crashes after destroy

content/browser/renderer_host/surface_texture_transport_client_android.cc

Index: content/browser/renderer_host/surface_texture_transport_client_android.cc
diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.cc b/content/browser/renderer_host/surface_texture_transport_client_android.cc
index 8c2b8d34166603fce761ad12e96f684ff5d4cdae..035fc1a8c41180c475a040ae55e586c9d6ab68a7 100644
--- a/content/browser/renderer_host/surface_texture_transport_client_android.cc
+++ b/content/browser/renderer_host/surface_texture_transport_client_android.cc
@@ -27,10 +27,15 @@ namespace content {
 
 SurfaceTextureTransportClient::SurfaceTextureTransportClient()
     : window_(NULL),
-      texture_id_(0) {
+      texture_id_(0),
+      surface_id_(0) {
 }
 
 SurfaceTextureTransportClient::~SurfaceTextureTransportClient() {
+  if (surface_id_) {
+    GpuSurfaceTracker::Get()->SetNativeWidget(
+        surface_id_, gfx::kNullAcceleratedWidget);
+  }
   if (window_)
     ANativeWindow_release(window_);
 }
@@ -51,6 +56,8 @@ scoped_refptr<cc::Layer> SurfaceTextureTransportClient::Initialize() {
 gfx::GLSurfaceHandle
 SurfaceTextureTransportClient::GetCompositingSurface(int surface_id) {
   DCHECK(surface_id);
+  surface_id_ = surface_id;
+
   if (!window_)
     window_ = surface_texture_->CreateSurface();