Index: content/browser/compositor/browser_compositor_output_surface.cc |
diff --git a/content/browser/compositor/browser_compositor_output_surface.cc b/content/browser/compositor/browser_compositor_output_surface.cc |
index 0fe1e7c844e6a63696a9e4e250947c3822b4d64f..7a44c14bb00229d1896955edbaf2c4293aac9401 100644 |
--- a/content/browser/compositor/browser_compositor_output_surface.cc |
+++ b/content/browser/compositor/browser_compositor_output_surface.cc |
@@ -13,15 +13,19 @@ |
namespace content { |
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface( |
- const scoped_refptr<cc::ContextProvider>& context_provider) |
+ const scoped_refptr<cc::ContextProvider>& context_provider, |
+ const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager) |
: OutputSurface(context_provider), |
+ vsync_manager_(vsync_manager), |
reflector_(nullptr) { |
Initialize(); |
} |
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface( |
- scoped_ptr<cc::SoftwareOutputDevice> software_device) |
+ scoped_ptr<cc::SoftwareOutputDevice> software_device, |
+ const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager) |
: OutputSurface(software_device.Pass()), |
+ vsync_manager_(vsync_manager), |
reflector_(nullptr) { |
Initialize(); |
} |
@@ -30,6 +34,9 @@ |
if (reflector_) |
reflector_->DetachFromOutputSurface(); |
DCHECK(!reflector_); |
+ if (!HasClient()) |
+ return; |
+ vsync_manager_->RemoveObserver(this); |
} |
void BrowserCompositorOutputSurface::Initialize() { |
@@ -37,11 +44,27 @@ |
capabilities_.adjust_deadline_for_parent = false; |
} |
+bool BrowserCompositorOutputSurface::BindToClient( |
+ cc::OutputSurfaceClient* client) { |
+ if (!OutputSurface::BindToClient(client)) |
+ return false; |
+ // Don't want vsync notifications until there is a client. |
+ vsync_manager_->AddObserver(this); |
+ return true; |
+} |
+ |
+void BrowserCompositorOutputSurface::OnUpdateVSyncParameters( |
+ base::TimeTicks timebase, |
+ base::TimeDelta interval) { |
+ DCHECK(HasClient()); |
+ CommitVSyncParameters(timebase, interval); |
+} |
+ |
void BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu( |
base::TimeTicks timebase, |
base::TimeDelta interval) { |
DCHECK(HasClient()); |
- CommitVSyncParameters(timebase, interval); |
+ vsync_manager_->UpdateVSyncParameters(timebase, interval); |
} |
void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) { |