| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 9069b9d97d6710bf32c384f8de0aca3a3700221d..74ecfa3982233081e7710ba20a9d938a42951520 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -135,6 +135,9 @@ class CC_EXPORT LayerTreeHost {
|
| void DeleteContentsTexturesOnImplThread(ResourceProvider* resource_provider);
|
| bool UpdateLayers(ResourceUpdateQueue* queue);
|
|
|
| + // Called when the compositor completed page scale animation.
|
| + void DidCompletePageScaleAnimation();
|
| +
|
| LayerTreeHostClient* client() { return client_; }
|
| const base::WeakPtr<InputHandler>& GetInputHandler() {
|
| return input_handler_weak_ptr_;
|
| @@ -449,6 +452,10 @@ class CC_EXPORT LayerTreeHost {
|
|
|
| scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
|
|
|
| + // If set, then page scale animation has completed, but the client hasn't been
|
| + // notified about it yet.
|
| + bool did_complete_scale_animation_;
|
| +
|
| bool in_paint_layer_contents_;
|
|
|
| static const int kTotalFramesToUseForLCDTextMetrics = 50;
|
|
|