Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1736)

Unified Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 2386643004: content: Handle OutputSurface requests correctly. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 36aa666a85aae10a26adf0654b0398b2ebbb183c..9d39f57b7794d2856b93ce181b8ea90563af6fba 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -647,7 +647,11 @@ void CompositorImpl::CreateVulkanOutputSurface() {
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698