aw: Fix hardware init/tear down in pop up flow

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 <queue>
-
-#include "base/callback.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 
 namespace android_webview {
 
 class BrowserViewRendererClient;
 
@@ skipping 36 matching lines @@
   content::SynchronousCompositor* GetCompositor();
 
   void SetMemoryPolicy(const content::SynchronousCompositorMemoryPolicy policy);
   content::SynchronousCompositorMemoryPolicy GetMemoryPolicy() const;
 
   void SetMemoryPolicyDirty(bool is_dirty);
   bool IsMemoryPolicyDirty() const;
   void SetDrawGLInput(const DrawGLInput& input);
   DrawGLInput GetDrawGLInput() const;
 
-  void ClearClosureQueue();
-  void AppendClosure(const base::Closure& closure);
-  // Will return empty closure if queue empty.
-  base::Closure PopFrontClosure();
+  // 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;
 
  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_;
   content::SynchronousCompositor* compositor_;
   content::SynchronousCompositorMemoryPolicy memory_policy_;
   // Set to true when SetMemoryPolicy called with a different memory policy.
   // Set to false when memory policy is read and enforced to compositor.
   bool memory_policy_dirty_;
   DrawGLInput draw_gl_input_;
-  std::queue<base::Closure> closure_queue_;
+  bool hardware_allowed_;
   bool hardware_initialized_;
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_SHARED_RENDERER_STATE_H_