Android: Improve Composite-with-no-GPU-channel handling

content/browser/renderer_host/compositor_impl_android.h

Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 54c6469eb4709024be81459abd8224edd987e703..51e136867732e9f58c40ae991c9303f20c528a63 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -124,7 +124,8 @@ class CONTENT_EXPORT CompositorImpl
   }
   bool WillComposite() const {
     return WillCompositeThisFrame() ||
-           composite_on_vsync_trigger_ != DO_NOT_COMPOSITE;
+           composite_on_vsync_trigger_ != DO_NOT_COMPOSITE ||
+           defer_composite_for_gpu_channel_;
   }
   void CancelComposite() {
     DCHECK(WillComposite());
@@ -185,6 +186,11 @@ class CONTENT_EXPORT CompositorImpl
   // 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_;
+
   base::TimeDelta vsync_period_;
   base::TimeTicks last_vsync_;