content: Handle OutputSurface requests correctly.

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 <stdint.h>
 #include <unordered_set>
@@ skipping 628 matching lines @@
     return;
 
   InitializeDisplay(std::move(display_output_surface),
                     std::move(vulkan_context_provider), nullptr);
 }
 #endif
 
 void CompositorImpl::OnGpuChannelEstablished(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
     ui::ContextProviderFactory::GpuChannelHostResult result) {
-  DCHECK(output_surface_request_pending_);
+  // We might end up queing multiple GpuChannel requests for the same
+  // OutputSurface request as the visibility of the compositor changes, so the
+  // OutputSurface request could have been handled already.
+  if (!output_surface_request_pending_)
+    return;
 
   switch (result) {
     // Don't retry if we are shutting down.
     case ui::ContextProviderFactory::GpuChannelHostResult::
         FAILURE_FACTORY_SHUTDOWN:
       break;
     case ui::ContextProviderFactory::GpuChannelHostResult::
         FAILURE_GPU_PROCESS_INITIALIZATION_FAILED:
       // TODO(khushalsagar): Retry or have a fallback path after
       // crbug.com/643282 is resolved.
@@ skipping 152 matching lines @@
 
   TRACE_EVENT0("compositor", "Compositor::SetNeedsAnimate");
   host_->SetNeedsAnimate();
 }
 
 bool CompositorImpl::HavePendingReadbacks() {
   return !readback_layer_tree_->children().empty();
 }
 
 }  // namespace content