content/browser/compositor/software_output_device_ozone_unittest.cc - Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

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 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate (Closed)

Patch Set: Restore mash Created 4 years 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/compositor/surface_utils.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 4f4eebc3736c4b1650dfa3fe5f51900f7f8c3984..8c072d2c09e05964e4c4fd794ea22616738310ae 100644

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

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

@@ -86,14 +86,16 @@ SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {

}

void SoftwareOutputDeviceOzoneTest::SetUp() {

- ui::ContextFactory* context_factory =

- ui::InitializeContextFactoryForTests(enable_pixel_output_);

+ ui::ContextFactory* context_factory = nullptr;

+ ui::ContextFactoryPrivate* context_factory_private = nullptr;

+ ui::InitializeContextFactoryForTests(enable_pixel_output_, &context_factory,

+ &context_factory_private);

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

window_ = ui::OzonePlatform::GetInstance()->CreatePlatformWindow(

&window_delegate_, gfx::Rect(size));

- compositor_.reset(

- new ui::Compositor(context_factory, base::ThreadTaskRunnerHandle::Get()));

+ compositor_.reset(new ui::Compositor(context_factory, nullptr,

+ base::ThreadTaskRunnerHandle::Get()));

compositor_->SetAcceleratedWidget(window_delegate_.GetAcceleratedWidget());

compositor_->SetScaleAndSize(1.0f, size);