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

Unified Diff: content/browser/compositor/delegated_frame_host.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/delegated_frame_host.cc
diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc
index 026e0e0dba7c2dedfe362aa361ca5f1130d9162b..5129e076ea54fba714d82915d952e8fecb998b4c 100644
--- a/content/browser/compositor/delegated_frame_host.cc
+++ b/content/browser/compositor/delegated_frame_host.cc
@@ -905,13 +905,11 @@ void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) {
DCHECK(!compositor_);
}
-void DelegatedFrameHost::OnUpdateVSyncParameters(
+void DelegatedFrameHost::UpdateVSyncParameters(
danakj 2015/03/25 17:40:38 s/Update/Set/ ?
simonhong 2015/03/25 18:05:22 Done.
base::TimeTicks timebase,
base::TimeDelta interval) {
vsync_timebase_ = timebase;
vsync_interval_ = interval;
- if (client_->DelegatedFrameHostIsVisible())
- client_->DelegatedFrameHostUpdateVSyncParameters(timebase, interval);
}
////////////////////////////////////////////////////////////////////////////////
@@ -942,8 +940,6 @@ DelegatedFrameHost::~DelegatedFrameHost() {
surface_factory_->Destroy(surface_id_);
if (resource_collection_.get())
resource_collection_->SetClient(NULL);
-
- DCHECK(!vsync_manager_.get());
}
void DelegatedFrameHost::RunOnCommitCallbacks() {
@@ -970,9 +966,6 @@ void DelegatedFrameHost::SetCompositor(ui::Compositor* compositor) {
return;
compositor_ = compositor;
compositor_->AddObserver(this);
- DCHECK(!vsync_manager_.get());
- vsync_manager_ = compositor_->vsync_manager();
- vsync_manager_->AddObserver(this);
}
void DelegatedFrameHost::ResetCompositor() {
@@ -985,10 +978,6 @@ void DelegatedFrameHost::ResetCompositor() {
}
if (compositor_->HasObserver(this))
compositor_->RemoveObserver(this);
- if (vsync_manager_.get()) {
- vsync_manager_->RemoveObserver(this);
- vsync_manager_ = NULL;
- }
compositor_ = nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698