content/browser/renderer_host/compositor_impl_android.cc - Issue 2144393003: cc: Allow TestDelegatingOutputSurface to be used for non-pixel tests.

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/renderer_host/compositor_impl_android.cc

Issue 2144393003: cc: Allow TestDelegatingOutputSurface to be used for non-pixel tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/renderer/android/synchronous_compositor_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/compositor_impl_android.cc

diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc

index 21519727a028a6259a9f651627b7ef0f637a554e..66bc2eb270e83844ab6dd208fee4438d12d5ddf4 100644

--- a/content/browser/renderer_host/compositor_impl_android.cc

+++ b/content/browser/renderer_host/compositor_impl_android.cc

@@ -701,11 +701,10 @@ void CompositorImpl::CreateOutputSurface() {

display_output_surface->capabilities().max_frames_pending));

display_.reset(new cc::Display(

- manager, HostSharedBitmapManager::current(),

+ HostSharedBitmapManager::current(),

BrowserGpuMemoryBufferManager::current(),

- host_->settings().renderer_settings, surface_id_allocator_->client_id(),

- std::move(begin_frame_source), std::move(display_output_surface),

- std::move(scheduler),

+ host_->settings().renderer_settings, std::move(begin_frame_source),

+ std::move(display_output_surface), std::move(scheduler),

base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)));

std::unique_ptr<cc::SurfaceDisplayOutputSurface> delegated_output_surface(