content/browser/compositor/software_output_device_ozone_unittest.cc - Issue 273073002: Changes code using Compositor to pass in 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 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tooltip on chromeos 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

« no previous file with comments | « content/browser/compositor/software_browser_compositor_output_surface_unittest.cc ('k') | content/browser/media/capture/desktop_capture_device_aura_unittest.cc » ('j') | no next file with comments »
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 158e932001865f499ce7007b6cc1db4054c13c4a..e80b23a0ed199ec29f3fab088e72fe3077602f7c 100644

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

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

@@ -99,13 +99,15 @@ SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {

}

void SoftwareOutputDeviceOzoneTest::SetUp() {

- ui::InitializeContextFactoryForTests(enable_pixel_output_);

+ ui::ContextFactory* context_factory =

+ ui::InitializeContextFactoryForTests(enable_pixel_output_);

surface_factory_.reset(new MockSurfaceFactoryOzone());

const gfx::Size size(500, 400);

compositor_.reset(new ui::Compositor(

- gfx::SurfaceFactoryOzone::GetInstance()->GetAcceleratedWidget()));

+ gfx::SurfaceFactoryOzone::GetInstance()->GetAcceleratedWidget(),

+ context_factory));

compositor_->SetScaleAndSize(1.0f, size);

output_device_.reset(new content::SoftwareOutputDeviceOzone(