| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index ed7472d638ba891a70e9ae04a6384fc70068fde8..9fc019e59a6749ec05ae96dc98fecd75e62b0ce3 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),
|
| @@ -237,10 +237,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() {
|
| @@ -1082,7 +1082,7 @@ void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) {
|
| }
|
|
|
| void LayerTreeHost::StartRateLimiter() {
|
| - if (animating_)
|
| + if (inside_begin_main_frame_)
|
| return;
|
|
|
| if (!rate_limit_timer_.IsRunning()) {
|
|
|