| Index: cc/animation/animation_host.h
|
| diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
|
| index 4a7ffbfbb1accf7e63c933e1f2d3011fc6d0465b..9c570e61840a753663f43a5dcfc80340071f56ac 100644
|
| --- a/cc/animation/animation_host.h
|
| +++ b/cc/animation/animation_host.h
|
| @@ -79,8 +79,8 @@ class CC_EXPORT AnimationHost {
|
| }
|
| void SetMutatorHostClient(MutatorHostClient* client);
|
|
|
| - void SetNeedsCommit();
|
| - void SetNeedsRebuildPropertyTrees();
|
| + void SetNeedsPushProperties();
|
| + bool needs_push_properties() const { return needs_push_properties_; }
|
|
|
| void PushPropertiesTo(AnimationHost* host_impl);
|
|
|
| @@ -170,11 +170,6 @@ class CC_EXPORT AnimationHost {
|
| const ElementToAnimationsMap& active_element_animations_for_testing() const;
|
| const ElementToAnimationsMap& all_element_animations_for_testing() const;
|
|
|
| - bool animation_waiting_for_deletion() const {
|
| - return animation_waiting_for_deletion_;
|
| - }
|
| - void OnAnimationWaitingForDeletion();
|
| -
|
| private:
|
| explicit AnimationHost(ThreadInstance thread_instance);
|
|
|
| @@ -200,7 +195,7 @@ class CC_EXPORT AnimationHost {
|
| const ThreadInstance thread_instance_;
|
|
|
| bool supports_scroll_animations_;
|
| - bool animation_waiting_for_deletion_;
|
| + bool needs_push_properties_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AnimationHost);
|
| };
|
|
|