content/browser/compositor/gpu_process_transport_factory.cc - Issue 548153004: Unified BeginFrame scheduling

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/gpu_process_transport_factory.cc

Issue 548153004: Unified BeginFrame scheduling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git cl format Created 6 years, 3 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_browser_compositor_output_surface.cc ('k') | content/browser/compositor/software_browser_compositor_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/gpu_process_transport_factory.cc

diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc

index fe90a7c50fcdb613433eca2ee65401bf75b6e231..ef91eff3e47ca3597d8ae1117adc7072ab7e09d1 100644

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

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

@@ -188,15 +188,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(

output_surface_proxy_,

CreateSoftwareOutputDevice(compositor),

per_compositor_data_[compositor]->surface_id,

- &output_surface_map_,

- compositor->vsync_manager()));

- } else {

- display_surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface(

- context_provider,

- per_compositor_data_[compositor]->surface_id,

- &output_surface_map_,

- compositor->vsync_manager(),

- CreateOverlayCandidateValidator(compositor->widget())));

+ &output_surface_map_));

}

scoped_ptr<OnscreenDisplayClient> display_client(new OnscreenDisplayClient(

display_surface.Pass(), manager, compositor->task_runner()));

@@ -227,8 +219,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(

output_surface_proxy_,

CreateSoftwareOutputDevice(compositor),

per_compositor_data_[compositor]->surface_id,

- &output_surface_map_,

- compositor->vsync_manager()));

+ &output_surface_map_));

return surface.PassAs<cc::OutputSurface>();

}

@@ -237,7 +228,6 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(

context_provider,

per_compositor_data_[compositor]->surface_id,

&output_surface_map_,

- compositor->vsync_manager(),

CreateOverlayCandidateValidator(compositor->widget())));

if (data->reflector.get())

data->reflector->ReattachToOutputSurfaceFromMainThread(surface.get());