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

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

Issue 1587073011: Plumb NotifyAnimationAborted from the compositor to blink animation delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initialize aborted_ in unittest Created 4 years, 11 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 | « cc/layers/layer_impl.h ('k') | cc/test/test_hooks.h » ('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_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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 class TestAnimationDelegate : public AnimationDelegate { 144 class TestAnimationDelegate : public AnimationDelegate {
145 public: 145 public:
146 TestAnimationDelegate(); 146 TestAnimationDelegate();
147 147
148 void NotifyAnimationStarted(base::TimeTicks monotonic_time, 148 void NotifyAnimationStarted(base::TimeTicks monotonic_time,
149 Animation::TargetProperty target_property, 149 Animation::TargetProperty target_property,
150 int group) override; 150 int group) override;
151 void NotifyAnimationFinished(base::TimeTicks monotonic_time, 151 void NotifyAnimationFinished(base::TimeTicks monotonic_time,
152 Animation::TargetProperty target_property, 152 Animation::TargetProperty target_property,
153 int group) override; 153 int group) override;
154 void NotifyAnimationAborted(base::TimeTicks monotonic_time,
155 Animation::TargetProperty target_property,
156 int group) override {}
154 bool started_; 157 bool started_;
155 bool finished_; 158 bool finished_;
156 }; 159 };
157 160
158 class AnimationTimelinesTest : public testing::Test { 161 class AnimationTimelinesTest : public testing::Test {
159 public: 162 public:
160 AnimationTimelinesTest(); 163 AnimationTimelinesTest();
161 ~AnimationTimelinesTest() override; 164 ~AnimationTimelinesTest() override;
162 165
163 protected: 166 protected:
(...skipping 27 matching lines...) Expand all
191 scoped_refptr<AnimationTimeline> timeline_; 194 scoped_refptr<AnimationTimeline> timeline_;
192 scoped_refptr<AnimationPlayer> player_; 195 scoped_refptr<AnimationPlayer> player_;
193 196
194 scoped_refptr<AnimationTimeline> timeline_impl_; 197 scoped_refptr<AnimationTimeline> timeline_impl_;
195 scoped_refptr<AnimationPlayer> player_impl_; 198 scoped_refptr<AnimationPlayer> player_impl_;
196 }; 199 };
197 200
198 } // namespace cc 201 } // namespace cc
199 202
200 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ 203 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/test/test_hooks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698