content/browser/compositor/software_output_device_ozone_unittest.cc - Issue 277713002: ui/compositor: move the browser compositor thread to the ContextFactory

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: content/browser/compositor/software_output_device_ozone_unittest.cc

Issue 277713002: ui/compositor: move the browser compositor thread to the ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« content/browser/compositor/gpu_process_transport_factory.cc ('K') | « content/browser/compositor/software_browser_compositor_output_surface_unittest.cc ('k') | mojo/aura/context_factory_mojo.h » ('j') | ui/aura/env.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/software_output_device_ozone_unittest.cc

diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc

index fc9a6d3abdcc78a720b4c7061cc82508b75ff883..9f9876778981157dbdb5fa07563e0d47fff07a62 100644

--- a/content/browser/compositor/software_output_device_ozone_unittest.cc

+++ b/content/browser/compositor/software_output_device_ozone_unittest.cc

@@ -100,7 +100,6 @@ SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {

void SoftwareOutputDeviceOzoneTest::SetUp() {

ui::InitializeContextFactoryForTests(enable_pixel_output_);

- ui::Compositor::Initialize();

surface_factory_.reset(new MockSurfaceFactoryOzone());

gfx::SurfaceFactoryOzone::SetInstance(surface_factory_.get());

@@ -120,7 +119,6 @@ void SoftwareOutputDeviceOzoneTest::TearDown() {

compositor_.reset();

surface_factory_.reset();

ui::TerminateContextFactoryForTests();

- ui::Compositor::Terminate();

}

class SoftwareOutputDeviceOzonePixelTest