Android: Fix GPU recovery issues

content/browser/renderer_host/compositor_impl_android.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
@@ skipping 58 matching lines @@
   void Layout() override;
   void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
                            const gfx::Vector2dF& outer_delta,
                            const gfx::Vector2dF& elastic_overscroll_delta,
                            float page_scale,
                            float top_controls_delta) override {}
   void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
                            float page_scale,
                            float top_controls_delta) override {}
   void RequestNewOutputSurface() override;
-  void DidInitializeOutputSurface() override {}
+  void DidInitializeOutputSurface() override;
   void DidFailToInitializeOutputSurface() override;
   void WillCommit() override {}
   void DidCommit() override;
   void DidCommitAndDrawFrame() override {}
   void DidCompleteSwapBuffers() override;
   void DidCompletePageScaleAnimation() override {}
 
   // LayerTreeHostSingleThreadClient implementation.
   void ScheduleComposite() override;
   void ScheduleAnimation() override;
@@ skipping 22 matching lines @@
   bool WillCompositeThisFrame() const {
     return current_composite_task_ &&
            !current_composite_task_->callback().is_null();
   }
   bool DidCompositeThisFrame() const {
     return current_composite_task_ &&
            current_composite_task_->callback().is_null();
   }
   bool WillComposite() const {
     return WillCompositeThisFrame() ||
-           composite_on_vsync_trigger_ != DO_NOT_COMPOSITE ||
-           defer_composite_for_gpu_channel_;
+           composite_on_vsync_trigger_ != DO_NOT_COMPOSITE;
   }
   void CancelComposite() {
     DCHECK(WillComposite());
     if (WillCompositeThisFrame())
       current_composite_task_->Cancel();
     current_composite_task_.reset();
     composite_on_vsync_trigger_ = DO_NOT_COMPOSITE;
     will_composite_immediately_ = false;
   }
   void CreateLayerTreeHost();
-  void OnGpuChannelEstablished();
 
   // root_layer_ is the persistent internal root layer, while subroot_layer_
   // is the one attached by the compositor client.
   scoped_refptr<cc::Layer> root_layer_;
   scoped_refptr<cc::Layer> subroot_layer_;
 
   scoped_ptr<cc::LayerTreeHost> host_;
   ui::UIResourceProvider ui_resource_provider_;
   ui::ResourceManagerImpl resource_manager_;
 
@@ skipping 31 matching lines @@
   // How we should schedule Composite during the next vsync.
   CompositingTrigger composite_on_vsync_trigger_;
 
   // The Composite operation scheduled for the current vsync interval.
   scoped_ptr<base::CancelableClosure> current_composite_task_;
 
   // The number of SwapBuffer calls that have not returned and ACK'd from
   // the GPU thread.
   unsigned int pending_swapbuffers_;
 
-  // Whether we are currently deferring a requested Composite operation until
-  // the GPU channel is established (it was either lost or not yet fully
-  // established the first time we tried to composite).
-  bool defer_composite_for_gpu_channel_;
+  size_t num_successive_context_creation_failures_;
 
   base::TimeDelta vsync_period_;
   base::TimeTicks last_vsync_;
 
+  // If set, a pending task to request or create a new OutputSurface for the
+  // current host. Cancelled when |host_| gets destroyed, so we don't call
+  // into the new LayerTreeHost with an old LTH's request.
+  scoped_ptr<base::CancelableClosure> output_surface_task_for_host_;
+
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_