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

Unified Diff: cc/trees/layer_tree_host.cc

Issue 429743003: Rename Animate as Begin(Main)Frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build fix. Created 6 years, 4 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
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 9eb6e0e3140ba777d81cacad13b45d8e811914f9..a539d13bab87da1cd515e544442197341bb41814 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -97,7 +97,7 @@ LayerTreeHost::LayerTreeHost(LayerTreeHostClient* client,
const LayerTreeSettings& settings)
: micro_benchmark_controller_(this),
next_ui_resource_id_(1),
- animating_(false),
+ inside_begin_main_frame_(false),
needs_full_tree_sync_(true),
client_(client),
source_frame_number_(0),
@@ -239,10 +239,10 @@ void LayerTreeHost::DidBeginMainFrame() {
client_->DidBeginMainFrame();
}
-void LayerTreeHost::UpdateClientAnimations(base::TimeTicks frame_begin_time) {
- animating_ = true;
- client_->Animate(frame_begin_time);
- animating_ = false;
+void LayerTreeHost::BeginMainFrame(const BeginFrameArgs& args) {
+ inside_begin_main_frame_ = true;
+ client_->BeginMainFrame(args);
+ inside_begin_main_frame_ = false;
}
void LayerTreeHost::DidStopFlinging() {
@@ -1093,7 +1093,7 @@ void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) {
}
void LayerTreeHost::StartRateLimiter() {
- if (animating_)
+ if (inside_begin_main_frame_)
return;
if (!rate_limit_timer_.IsRunning()) {
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698