cc/trees/single_thread_proxy.cc - Issue 871743002: cc: Fix multiple outstanding output surface requests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/trees/single_thread_proxy.cc

Issue 871743002: cc: Fix multiple outstanding output surface requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Using CompositorDeps Created 5 years, 11 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 | « cc/trees/layer_tree_host_unittest_context.cc ('k') | content/renderer/gpu/compositor_dependencies.h » ('j') | content/renderer/gpu/compositor_dependencies.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/single_thread_proxy.cc

diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc

index 83e6bbed0bc06fefc567bb257a3252ffce180134..7d5689f1ddb87903474126621bfcd6c1dd71f40d 100644

--- a/cc/trees/single_thread_proxy.cc

+++ b/cc/trees/single_thread_proxy.cc

@@ -135,7 +135,7 @@ void SingleThreadProxy::SetOutputSurface(

scoped_ptr<OutputSurface> output_surface) {

DCHECK(Proxy::IsMainThread());

DCHECK(layer_tree_host_->output_surface_lost());

- output_surface_creation_requested_ = false;

+ DCHECK(output_surface_creation_requested_);

renderer_capabilities_for_main_thread_ = RendererCapabilities();

bool success;

@@ -153,7 +153,10 @@ void SingleThreadProxy::SetOutputSurface(

scheduler_on_impl_thread_->DidCreateAndInitializeOutputSurface();

else if (!inside_synchronous_composite_)

SetNeedsCommit();

+ output_surface_creation_requested_ = false;

} else {

+ // DidFailToInitializeOutputSurface is treated as a RequestNewOutputSurface,

+ // and so output_surface_creation_requested remains true.

layer_tree_host_->DidFailToInitializeOutputSurface();

}