Merge 279934 "aw: Fix hardware teardown race"

android_webview/browser/shared_renderer_state.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_SHARED_RENDERER_STATE_H_
 #define ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
@@ skipping 38 matching lines @@
 
   void ClientRequestDrawGL();
 
   void SetDrawGLInput(scoped_ptr<DrawGLInput> input);
   scoped_ptr<DrawGLInput> PassDrawGLInput();
 
   // Set by UI and read by RT.
   void SetHardwareAllowed(bool allowed);
   bool IsHardwareAllowed() const;
 
-  // Set by RT and read by UI.
-  void SetHardwareInitialized(bool initialized);
-  bool IsHardwareInitialized() const;
-
   void SetSharedContext(gpu::GLInProcessContext* context);
   gpu::GLInProcessContext* GetSharedContext() const;
 
   void ReturnResources(const cc::TransferableResourceArray& input);
   void InsertReturnedResources(const cc::ReturnedResourceArray& resources);
   void SwapReturnedResources(cc::ReturnedResourceArray* resources);
   bool ReturnedResourcesEmpty() const;
 
  private:
   void ClientRequestDrawGLOnUIThread();
 
   scoped_refptr<base::MessageLoopProxy> ui_loop_;
   // TODO(boliu): Remove |client_on_ui_| from shared state.
   BrowserViewRendererClient* client_on_ui_;
   base::WeakPtrFactory<SharedRendererState> weak_factory_on_ui_thread_;
   base::WeakPtr<SharedRendererState> ui_thread_weak_ptr_;
 
   // Accessed by both UI and RT thread.
   mutable base::Lock lock_;
   scoped_ptr<DrawGLInput> draw_gl_input_;
   bool hardware_allowed_;
-  bool hardware_initialized_;
   gpu::GLInProcessContext* share_context_;
   cc::ReturnedResourceArray returned_resources_;
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_