| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index 7c00672dde4022151d25ac9776410e819569b6a1..581753d7008b2b1b76bafd90d6575de925b4c6d8 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -130,6 +130,7 @@ LayerTreeHost::LayerTreeHost(
|
| background_color_(SK_ColorWHITE),
|
| has_transparent_background_(false),
|
| partial_texture_update_requests_(0),
|
| + did_complete_scale_animation_(false),
|
| in_paint_layer_contents_(false),
|
| total_frames_used_for_lcd_text_metrics_(0),
|
| id_(s_layer_tree_host_sequence_number.GetNext() + 1),
|
| @@ -403,6 +404,10 @@ void LayerTreeHost::UpdateHudLayer() {
|
| void LayerTreeHost::CommitComplete() {
|
| source_frame_number_++;
|
| client_->DidCommit();
|
| + if (did_complete_scale_animation_) {
|
| + client_->DidCompletePageScaleAnimation();
|
| + did_complete_scale_animation_ = false;
|
| + }
|
| }
|
|
|
| void LayerTreeHost::SetOutputSurface(scoped_ptr<OutputSurface> surface) {
|
| @@ -784,6 +789,10 @@ bool LayerTreeHost::UpdateLayers(ResourceUpdateQueue* queue) {
|
| return result || next_commit_forces_redraw_;
|
| }
|
|
|
| +void LayerTreeHost::DidCompletePageScaleAnimation() {
|
| + did_complete_scale_animation_ = true;
|
| +}
|
| +
|
| static Layer* FindFirstScrollableLayer(Layer* layer) {
|
| if (!layer)
|
| return NULL;
|
|
|