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

content/browser/renderer_host/compositor_impl_android.cc

 // 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.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 167 matching lines @@
       surface_id_(0),
       client_(client),
       root_window_(root_window),
       did_post_swapbuffers_(false),
       ignore_schedule_composite_(false),
       needs_composite_(false),
       needs_animate_(false),
       will_composite_immediately_(false),
       composite_on_vsync_trigger_(DO_NOT_COMPOSITE),
       pending_swapbuffers_(0U),
+      defer_composite_for_gpu_channel_(false),
       weak_factory_(this) {
   DCHECK(client);
   DCHECK(root_window);
   ImageTransportFactoryAndroid::AddObserver(this);
   root_window->AttachCompositor(this);
 }
 
 CompositorImpl::~CompositorImpl() {
   root_window_->DetachCompositor();
   ImageTransportFactoryAndroid::RemoveObserver(this);
   // Clean-up any surface references.
   SetSurface(NULL);
 }
 
 void CompositorImpl::PostComposite(CompositingTrigger trigger) {
   DCHECK(needs_composite_);
   DCHECK(trigger == COMPOSITE_IMMEDIATELY || trigger == COMPOSITE_EVENTUALLY);
 
-  if (will_composite_immediately_ ||
+  if (defer_composite_for_gpu_channel_ || will_composite_immediately_ ||
       (trigger == COMPOSITE_EVENTUALLY && WillComposite())) {
     // We will already composite soon enough.
     DCHECK(WillComposite());
     return;
   }
 
   if (DidCompositeThisFrame()) {
     DCHECK(!WillCompositeThisFrame());
     if (composite_on_vsync_trigger_ != COMPOSITE_IMMEDIATELY) {
       composite_on_vsync_trigger_ = trigger;
@@ skipping 35 matching lines @@
   if (current_composite_task_)
     current_composite_task_->Cancel();
 
   // Unretained because we cancel the task on shutdown.
   current_composite_task_.reset(new base::CancelableClosure(
       base::Bind(&CompositorImpl::Composite, base::Unretained(this), trigger)));
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, current_composite_task_->callback(), delay);
 }
 
+void CompositorImpl::OnGpuChannelEstablished() {
+  defer_composite_for_gpu_channel_ = false;
+
+  if (host_)
+    PostComposite(COMPOSITE_IMMEDIATELY);
+}
+
 void CompositorImpl::Composite(CompositingTrigger trigger) {
+  if (trigger == COMPOSITE_IMMEDIATELY)
+    will_composite_immediately_ = false;
+
   BrowserGpuChannelHostFactory* factory =
       BrowserGpuChannelHostFactory::instance();
   if (!factory->GetGpuChannel() || factory->GetGpuChannel()->IsLost()) {
     CauseForGpuLaunch cause =
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
-    factory->EstablishGpuChannel(cause,
-                                 base::Bind(&CompositorImpl::ScheduleComposite,
-                                            weak_factory_.GetWeakPtr()));
+    factory->EstablishGpuChannel(
+        cause, base::Bind(&CompositorImpl::OnGpuChannelEstablished,
+                          weak_factory_.GetWeakPtr()));

[jdduke (slow), 2014/11/21 21:16:34]

Maybe |DCHECK(!defer_composite_for_gpu_channel_);| here?

[no sievers, 2014/11/21 21:19:19]

Done.

+    defer_composite_for_gpu_channel_ = true;
+    current_composite_task_.reset();
     return;
   }
 
   DCHECK(host_);
   DCHECK(trigger == COMPOSITE_IMMEDIATELY || trigger == COMPOSITE_EVENTUALLY);
   DCHECK(needs_composite_);
   DCHECK(!DidCompositeThisFrame());
 
-  if (trigger == COMPOSITE_IMMEDIATELY)
-    will_composite_immediately_ = false;
-
   DCHECK_LE(pending_swapbuffers_, kMaxSwapBuffers);
   if (pending_swapbuffers_ == kMaxSwapBuffers) {
     TRACE_EVENT0("compositor", "CompositorImpl_SwapLimit");
     return;
   }
 
   // Reset state before Layout+Composite since that might create more
   // requests to Composite that we need to respect.
   needs_composite_ = false;
 
@@ skipping 110 matching lines @@
     ui_resource_provider_.SetLayerTreeHost(NULL);
     host_.reset();
     display_client_.reset();
     if (current_composite_task_) {
       current_composite_task_->Cancel();
       current_composite_task_.reset();
     }
   } else if (!host_) {
     DCHECK(!WillComposite());
     needs_composite_ = false;
+    defer_composite_for_gpu_channel_ = false;
     pending_swapbuffers_ = 0;
     cc::LayerTreeSettings settings;
     settings.refresh_rate = 60.0;
     settings.impl_side_painting = false;
     settings.allow_antialiasing = false;
     settings.calculate_top_controls_position = false;
     settings.top_controls_height = 0.f;
     settings.highp_threshold_min = 2048;
 
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ skipping 247 matching lines @@
 }
 
 void CompositorImpl::SetNeedsAnimate() {
   if (!host_)
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content