Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 775143003: cc: Implement unified BeginFrame on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add unittest Created 5 years, 9 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
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 27fbefbb14522e0fdf9b07630f09cbfeab2c4f7d..7e2ee5f4716adaa5633c67367934894338955095 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -221,8 +221,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
scoped_ptr<BrowserCompositorOutputSurface> surface;
if (!create_gpu_output_surface) {
surface = make_scoped_ptr(new SoftwareBrowserCompositorOutputSurface(
- CreateSoftwareOutputDevice(compositor.get()),
- compositor->vsync_manager()));
+ CreateSoftwareOutputDevice(compositor.get())));
} else {
DCHECK(context_provider);
#if defined(USE_OZONE)
@@ -230,14 +229,14 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
->CanShowPrimaryPlaneAsOverlay()) {
surface =
make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface(
- context_provider, data->surface_id, compositor->vsync_manager(),
+ context_provider, data->surface_id,
CreateOverlayCandidateValidator(compositor->widget()), GL_RGB,
BrowserGpuMemoryBufferManager::current()));
} else
#endif
{
surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface(
- context_provider, compositor->vsync_manager(),
+ context_provider,
CreateOverlayCandidateValidator(compositor->widget())));
}
}

Powered by Google App Engine
This is Rietveld 408576698