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

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

Issue 1016033006: Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac build 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 7a44c14bb00229d1896955edbaf2c4293aac9401..afcfd163696cbabfb05a58d7fafb44466f2821a8 100644
--- a/content/browser/compositor/browser_compositor_output_surface.cc
+++ b/content/browser/compositor/browser_compositor_output_surface.cc
@@ -13,19 +13,15 @@
namespace content {
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
- const scoped_refptr<cc::ContextProvider>& context_provider,
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
+ const scoped_refptr<cc::ContextProvider>& context_provider)
: OutputSurface(context_provider),
- vsync_manager_(vsync_manager),
reflector_(nullptr) {
Initialize();
}
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
- scoped_ptr<cc::SoftwareOutputDevice> software_device,
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
+ scoped_ptr<cc::SoftwareOutputDevice> software_device)
: OutputSurface(software_device.Pass()),
- vsync_manager_(vsync_manager),
reflector_(nullptr) {
Initialize();
}
@@ -34,9 +30,6 @@ BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
if (reflector_)
reflector_->DetachFromOutputSurface();
DCHECK(!reflector_);
- if (!HasClient())
- return;
- vsync_manager_->RemoveObserver(this);
}
void BrowserCompositorOutputSurface::Initialize() {
@@ -48,23 +41,14 @@ 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());
- vsync_manager_->UpdateVSyncParameters(timebase, interval);
+ CommitVSyncParameters(timebase, interval);
}
void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {

Powered by Google App Engine
This is Rietveld 408576698