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

Side by Side Diff: cc/animation/layer_animation_controller_unittest.cc

Issue 99733003: Add monotonic time and target property to cc::AnimationDelegate notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #include "cc/animation/layer_animation_controller.h" 5 #include "cc/animation/layer_animation_controller.h"
6 6
7 #include "cc/animation/animation.h" 7 #include "cc/animation/animation.h"
8 #include "cc/animation/animation_curve.h" 8 #include "cc/animation/animation_curve.h"
9 #include "cc/animation/animation_delegate.h" 9 #include "cc/animation/animation_delegate.h"
10 #include "cc/animation/animation_registrar.h" 10 #include "cc/animation/animation_registrar.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 EXPECT_EQ(end_filters, end_filter_event->filters); 550 EXPECT_EQ(end_filters, end_filter_event->filters);
551 EXPECT_TRUE(end_filter_event->is_impl_only); 551 EXPECT_TRUE(end_filter_event->is_impl_only);
552 } 552 }
553 553
554 class FakeAnimationDelegate : public AnimationDelegate { 554 class FakeAnimationDelegate : public AnimationDelegate {
555 public: 555 public:
556 FakeAnimationDelegate() 556 FakeAnimationDelegate()
557 : started_(false), 557 : started_(false),
558 finished_(false) {} 558 finished_(false) {}
559 559
560 virtual void NotifyAnimationStarted(double time) OVERRIDE { 560 virtual void NotifyAnimationStarted(
561 double wall_clock_time,
562 double monotonic_time,
563 Animation::TargetProperty target_property) OVERRIDE {
561 started_ = true; 564 started_ = true;
562 } 565 }
563 566
564 virtual void NotifyAnimationFinished(double time) OVERRIDE { 567 virtual void NotifyAnimationFinished(
568 double wall_clock_time,
569 double monotonic_time,
570 Animation::TargetProperty target_property) OVERRIDE {
565 finished_ = true; 571 finished_ = true;
566 } 572 }
567 573
568 bool started() { return started_; } 574 bool started() { return started_; }
569 575
570 bool finished() { return finished_; } 576 bool finished() { return finished_; }
571 577
572 private: 578 private:
573 bool started_; 579 bool started_;
574 bool finished_; 580 bool finished_;
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 // animation, and an Aborted event for the opacity animation. 1467 // animation, and an Aborted event for the opacity animation.
1462 EXPECT_EQ(2u, events->size()); 1468 EXPECT_EQ(2u, events->size());
1463 EXPECT_EQ(AnimationEvent::Finished, (*events)[0].type); 1469 EXPECT_EQ(AnimationEvent::Finished, (*events)[0].type);
1464 EXPECT_EQ(Animation::Transform, (*events)[0].target_property); 1470 EXPECT_EQ(Animation::Transform, (*events)[0].target_property);
1465 EXPECT_EQ(AnimationEvent::Aborted, (*events)[1].type); 1471 EXPECT_EQ(AnimationEvent::Aborted, (*events)[1].type);
1466 EXPECT_EQ(Animation::Opacity, (*events)[1].target_property); 1472 EXPECT_EQ(Animation::Opacity, (*events)[1].target_property);
1467 } 1473 }
1468 1474
1469 } // namespace 1475 } // namespace
1470 } // namespace cc 1476 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698