ui/views/mus/surface_context_factory.cc - Issue 1995613003: views/mus: Fix some flaky crashes during test teardown.

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: ui/views/mus/surface_context_factory.cc

Issue 1995613003: views/mus: Fix some flaky crashes during test teardown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views-mus-more-focus-fix

Patch Set: . Created 4 years, 7 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

Index: ui/views/mus/surface_context_factory.cc

diff --git a/ui/views/mus/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc

index 1d643095e830cad370ab2c51a11f911facd50f96..316d14e3c2713b68d618710d82a929f721bd31bf 100644

--- a/ui/views/mus/surface_context_factory.cc

+++ b/ui/views/mus/surface_context_factory.cc

@@ -39,7 +39,10 @@ SurfaceContextFactory::~SurfaceContextFactory() {}

void SurfaceContextFactory::CreateOutputSurface(

base::WeakPtr<ui::Compositor> compositor) {

// NOTIMPLEMENTED();

- compositor->SetOutputSurface(surface_binding_.CreateOutputSurface());

+ std::unique_ptr<cc::OutputSurface> surface =

+ surface_binding_.CreateOutputSurface();

+ if (surface)

+ compositor->SetOutputSurface(std::move(surface));

}

std::unique_ptr<ui::Reflector> SurfaceContextFactory::CreateReflector(

« no previous file with comments | « ui/views/mus/surface_binding.cc ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »