Leak instead of deadlock if executeHardwareAction fails

android_webview/browser/hardware_renderer.cc

 // Copyright 2014 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 "android_webview/browser/hardware_renderer.h"
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
@@ skipping 188 matching lines @@
   const char kDefaultTileSize[] = "384";
   if (!cl->HasSwitch(switches::kDefaultTileWidth))
     cl->AppendSwitchASCII(switches::kDefaultTileWidth, kDefaultTileSize);
 
   if (!cl->HasSwitch(switches::kDefaultTileHeight))
     cl->AppendSwitchASCII(switches::kDefaultTileHeight, kDefaultTileSize);
 }
 
 namespace internal {
 
-bool ScopedAllowGL::allow_gl = false;
+base::LazyInstance<base::ThreadLocalBoolean> ScopedAllowGL::allow_gl;
 
 // static
 bool ScopedAllowGL::IsAllowed() {
-  return GLViewRendererManager::GetInstance()->OnRenderThread() && allow_gl;
+  return allow_gl.Get().Get();
 }
 
 ScopedAllowGL::ScopedAllowGL() {
-  DCHECK(GLViewRendererManager::GetInstance()->OnRenderThread());
-  DCHECK(!allow_gl);
-  allow_gl = true;
+  DCHECK(!allow_gl.Get().Get());
+  allow_gl.Get().Set(true);
 
   if (g_service.Get())
     g_service.Get()->RunTasks();
 }
 
-ScopedAllowGL::~ScopedAllowGL() { allow_gl = false; }
+ScopedAllowGL::~ScopedAllowGL() { allow_gl.Get().Set(false); }
 
 DeferredGpuCommandService::DeferredGpuCommandService() {}
 
 DeferredGpuCommandService::~DeferredGpuCommandService() {
   base::AutoLock lock(tasks_lock_);
   DCHECK(tasks_.empty());
 }
 
 // static
 void DeferredGpuCommandService::RequestProcessGLOnUIThread() {
@@ skipping 59 matching lines @@
   base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef();
 }
 
 void DeferredGpuCommandService::Release() const {
   base::RefCountedThreadSafe<DeferredGpuCommandService>::Release();
 }
 
 }  // namespace internal
 
 }  // namespace android_webview