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

Side by Side Diff: cc/test/animation_timelines_test_common.h

Issue 1009233002: CC Animations: Port Impl-only-scrolling to use compositor animation timelines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui
Patch Set: Fix code review issues. Created 5 years, 5 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
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_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ 5 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "cc/animation/animation.h" 10 #include "cc/animation/animation.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 void SetLayerTransformMutated(int layer_id, 88 void SetLayerTransformMutated(int layer_id,
89 LayerTreeType tree_type, 89 LayerTreeType tree_type,
90 const gfx::Transform& transform) override; 90 const gfx::Transform& transform) override;
91 91
92 void SetLayerScrollOffsetMutated( 92 void SetLayerScrollOffsetMutated(
93 int layer_id, 93 int layer_id,
94 LayerTreeType tree_type, 94 LayerTreeType tree_type,
95 const gfx::ScrollOffset& scroll_offset) override; 95 const gfx::ScrollOffset& scroll_offset) override;
96 96
97 void ScrollOffsetAnimationFinished() override {}
98 gfx::ScrollOffset GetScrollOffsetForAnimation(int layer_id) const override;
99
97 bool mutators_need_commit() const { return mutators_need_commit_; } 100 bool mutators_need_commit() const { return mutators_need_commit_; }
98 void set_mutators_need_commit(bool need) { mutators_need_commit_ = need; } 101 void set_mutators_need_commit(bool need) { mutators_need_commit_ = need; }
99 102
100 void RegisterLayer(int layer_id, LayerTreeType tree_type); 103 void RegisterLayer(int layer_id, LayerTreeType tree_type);
101 void UnregisterLayer(int layer_id, LayerTreeType tree_type); 104 void UnregisterLayer(int layer_id, LayerTreeType tree_type);
102 105
103 AnimationHost* host() { 106 AnimationHost* host() {
104 DCHECK(host_); 107 DCHECK(host_);
105 return host_.get(); 108 return host_.get();
106 } 109 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 scoped_refptr<AnimationTimeline> timeline_; 184 scoped_refptr<AnimationTimeline> timeline_;
182 scoped_refptr<AnimationPlayer> player_; 185 scoped_refptr<AnimationPlayer> player_;
183 186
184 scoped_refptr<AnimationTimeline> timeline_impl_; 187 scoped_refptr<AnimationTimeline> timeline_impl_;
185 scoped_refptr<AnimationPlayer> player_impl_; 188 scoped_refptr<AnimationPlayer> player_impl_;
186 }; 189 };
187 190
188 } // namespace cc 191 } // namespace cc
189 192
190 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ 193 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698