Merge 279934 "aw: Fix hardware teardown race"

android_webview/browser/shared_renderer_state.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/shared_renderer_state.h"
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "base/bind.h"
 #include "base/location.h"
 
 namespace android_webview {
 
 DrawGLInput::DrawGLInput() : width(0), height(0) {
 }
 
 DrawGLInput::~DrawGLInput() {
 }
 
 SharedRendererState::SharedRendererState(
     scoped_refptr<base::MessageLoopProxy> ui_loop,
     BrowserViewRendererClient* client)
     : ui_loop_(ui_loop),
       client_on_ui_(client),
       weak_factory_on_ui_thread_(this),
       ui_thread_weak_ptr_(weak_factory_on_ui_thread_.GetWeakPtr()),
       hardware_allowed_(false),
-      hardware_initialized_(false),
       share_context_(NULL) {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   DCHECK(client_on_ui_);
 }
 
 SharedRendererState::~SharedRendererState() {}
 
 void SharedRendererState::ClientRequestDrawGL() {
   if (ui_loop_->BelongsToCurrentThread()) {
     ClientRequestDrawGLOnUIThread();
@@ skipping 26 matching lines @@
 void SharedRendererState::SetHardwareAllowed(bool allowed) {
   base::AutoLock lock(lock_);
   hardware_allowed_ = allowed;
 }
 
 bool SharedRendererState::IsHardwareAllowed() const {
   base::AutoLock lock(lock_);
   return hardware_allowed_;
 }
 
-void SharedRendererState::SetHardwareInitialized(bool initialized) {
-  base::AutoLock lock(lock_);
-  hardware_initialized_ = initialized;
-}
-
-bool SharedRendererState::IsHardwareInitialized() const {
-  base::AutoLock lock(lock_);
-  return hardware_initialized_;
-}
-
 void SharedRendererState::SetSharedContext(gpu::GLInProcessContext* context) {
   base::AutoLock lock(lock_);
   DCHECK(!share_context_ || !context);
   share_context_ = context;
 }
 
 gpu::GLInProcessContext* SharedRendererState::GetSharedContext() const {
   base::AutoLock lock(lock_);
   DCHECK(share_context_);
   return share_context_;
@@ skipping 17 matching lines @@
   base::AutoLock lock(lock_);
   resources->swap(returned_resources_);
 }
 
 bool SharedRendererState::ReturnedResourcesEmpty() const {
   base::AutoLock lock(lock_);
   return returned_resources_.empty();
 }
 
 }  // namespace android_webview