aw: Fix race between first frame draw and view detach causing deadlock.

android_webview/browser/render_thread_manager.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_RENDER_THREAD_MANAGER_H_
 #define ANDROID_WEBVIEW_BROWSER_RENDER_THREAD_MANAGER_H_
 
 #include <map>
 
 #include "android_webview/browser/compositor_frame_consumer.h"
@@ skipping 82 matching lines @@
   void UpdateParentDrawConstraintsOnUI();
   bool IsInsideHardwareRelease() const;
   void SetInsideHardwareRelease(bool inside);
 
   // Accessed by UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> ui_loop_;
   RenderThreadManagerClient* const client_;
   CompositorFrameProducer* compositor_frame_producer_;
   base::WeakPtr<RenderThreadManager> ui_thread_weak_ptr_;
   base::CancelableClosure request_draw_gl_cancelable_closure_;
+  // Whether any frame has been received on the UI thread by
+  // RenderThreadManager.
+  bool has_received_frame_;
 
   // Accessed by RT thread.
   std::unique_ptr<HardwareRenderer> hardware_renderer_;
 
   // This is accessed by both UI and RT now. TODO(hush): move to RT only.
   GLViewRendererManager::Key renderer_manager_key_;
 
   // Accessed by both UI and RT thread.
   mutable base::Lock lock_;
-  bool hardware_renderer_has_frame_;
   gfx::Vector2d scroll_offset_;
   ChildFrameQueue child_frames_;
   const bool sync_on_draw_hardware_;
   bool inside_hardware_release_;
   ParentCompositorDrawConstraints parent_draw_constraints_;
   ReturnedResourcesMap returned_resources_map_;
   base::Closure request_draw_gl_closure_;
 
   base::WeakPtrFactory<RenderThreadManager> weak_factory_on_ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadManager);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_RENDER_THREAD_MANAGER_H_