content/browser/compositor/software_output_device_ozone_unittest.cc - Issue 1391893003: NOT FOR REVIEW: Aura on Android

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 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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') | content/browser/compositor/surface_utils.cc » ('j') | content/browser/devtools/render_frame_devtools_agent_host.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 935fafa2b9ca11c192b48f8863eadf972e22765e..b0102b48224263da26394b7d1baa6866dc5a2277 100644

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

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

@@ -87,9 +87,10 @@ void SoftwareOutputDeviceOzoneTest::SetUp() {

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

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

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

- compositor_.reset(new ui::Compositor(window_delegate_.GetAcceleratedWidget(),

- context_factory,

- base::ThreadTaskRunnerHandle::Get()));

+ compositor_.reset(

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

+ compositor_->OnAcceleratedWidgetAvailable(

+ window_delegate_.GetAcceleratedWidget());

compositor_->SetScaleAndSize(1.0f, size);

output_device_.reset(new content::SoftwareOutputDeviceOzone(