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

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

Issue 1040813002: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/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) {
« no previous file with comments | « content/browser/compositor/browser_compositor_output_surface.h ('k') | content/browser/compositor/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698