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

Side by Side Diff: cc/animation/animation_host.h

Issue 1413003002: CC Animations: Fix AnimationHost mode integration with Property Trees. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: An attempt to fix weird EXPECT_EQ compilation errors. Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | cc/animation/animation_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_ANIMATION_ANIMATION_HOST_H_ 5 #ifndef CC_ANIMATION_ANIMATION_HOST_H_
6 #define CC_ANIMATION_ANIMATION_HOST_H_ 6 #define CC_ANIMATION_ANIMATION_HOST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 LayerAnimationController* GetControllerForLayerId(int layer_id) const; 65 LayerAnimationController* GetControllerForLayerId(int layer_id) const;
66 66
67 // Parent LayerTreeHost or LayerTreeHostImpl. 67 // Parent LayerTreeHost or LayerTreeHostImpl.
68 MutatorHostClient* mutator_host_client() { return mutator_host_client_; } 68 MutatorHostClient* mutator_host_client() { return mutator_host_client_; }
69 const MutatorHostClient* mutator_host_client() const { 69 const MutatorHostClient* mutator_host_client() const {
70 return mutator_host_client_; 70 return mutator_host_client_;
71 } 71 }
72 void SetMutatorHostClient(MutatorHostClient* client); 72 void SetMutatorHostClient(MutatorHostClient* client);
73 73
74 void SetNeedsCommit(); 74 void SetNeedsCommit();
75 void SetNeedsRebuildPropertyTrees();
75 76
76 void PushPropertiesTo(AnimationHost* host_impl); 77 void PushPropertiesTo(AnimationHost* host_impl);
77 78
78 AnimationRegistrar* animation_registrar() const { 79 AnimationRegistrar* animation_registrar() const {
79 return animation_registrar_.get(); 80 return animation_registrar_.get();
80 } 81 }
81 82
82 void SetSupportsScrollAnimations(bool supports_scroll_animations); 83 void SetSupportsScrollAnimations(bool supports_scroll_animations);
83 bool SupportsScrollAnimations() const; 84 bool SupportsScrollAnimations() const;
84 bool NeedsAnimateLayers() const; 85 bool NeedsAnimateLayers() const;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 scoped_ptr<ScrollOffsetAnimations> scroll_offset_animations_; 173 scoped_ptr<ScrollOffsetAnimations> scroll_offset_animations_;
173 174
174 const ThreadInstance thread_instance_; 175 const ThreadInstance thread_instance_;
175 176
176 DISALLOW_COPY_AND_ASSIGN(AnimationHost); 177 DISALLOW_COPY_AND_ASSIGN(AnimationHost);
177 }; 178 };
178 179
179 } // namespace cc 180 } // namespace cc
180 181
181 #endif // CC_ANIMATION_ANIMATION_HOST_H_ 182 #endif // CC_ANIMATION_ANIMATION_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | cc/animation/animation_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698