content/test/test_render_view_host.cc - Issue 2166423002: ui::ContextFactory should not create SurfaceIdAllocators

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/test/test_render_view_host.cc

Issue 2166423002: ui::ContextFactory should not create SurfaceIdAllocators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed Android + Addressed Antoine's comment Created 4 years, 5 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/renderer_host/render_widget_host_view_android.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/test_render_view_host.cc

diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc

index 29fc6f7c8b8d9649435e149c928e37ee873ad415..c3d3928a191e031576e7d36545e10bef2a30fa43 100644

--- a/content/test/test_render_view_host.cc

+++ b/content/test/test_render_view_host.cc

@@ -64,11 +64,13 @@ TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)

is_occluded_(false),

did_swap_compositor_frame_(false) {

#if defined(OS_ANDROID)

- surface_id_allocator_ = CreateSurfaceIdAllocator();

+ surface_id_allocator_.reset(

+ new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));

#else

// Not all tests initialize or need an image transport factory.

if (ImageTransportFactory::GetInstance())

- surface_id_allocator_ = CreateSurfaceIdAllocator();

+ surface_id_allocator_.reset(

+ new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));

#endif

rwh_->SetView(this);