| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/compositor/layer_animation_sequence.h" | 5 #include "ui/compositor/layer_animation_sequence.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "cc/animation/animation_events.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 11 #include "ui/compositor/layer_animation_delegate.h" | 12 #include "ui/compositor/layer_animation_delegate.h" |
| 12 #include "ui/compositor/layer_animation_element.h" | 13 #include "ui/compositor/layer_animation_element.h" |
| 13 #include "ui/compositor/test/test_layer_animation_delegate.h" | 14 #include "ui/compositor/test/test_layer_animation_delegate.h" |
| 14 #include "ui/compositor/test/test_layer_animation_observer.h" | 15 #include "ui/compositor/test/test_layer_animation_observer.h" |
| 15 #include "ui/compositor/test/test_utils.h" | 16 #include "ui/compositor/test/test_utils.h" |
| 16 #include "ui/gfx/geometry/rect.h" | 17 #include "ui/gfx/geometry/rect.h" |
| 17 #include "ui/gfx/transform.h" | 18 #include "ui/gfx/transform.h" |
| 18 | 19 |
| 19 namespace ui { | 20 namespace ui { |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 EXPECT_TRUE(!observer.last_ended_sequence()); | 264 EXPECT_TRUE(!observer.last_ended_sequence()); |
| 264 sequence.Progress(start_time + delta, &delegate); | 265 sequence.Progress(start_time + delta, &delegate); |
| 265 EXPECT_EQ(observer.last_ended_sequence(), &sequence); | 266 EXPECT_EQ(observer.last_ended_sequence(), &sequence); |
| 266 sequence.RemoveObserver(&observer); | 267 sequence.RemoveObserver(&observer); |
| 267 } | 268 } |
| 268 } | 269 } |
| 269 | 270 |
| 270 } // namespace | 271 } // namespace |
| 271 | 272 |
| 272 } // namespace ui | 273 } // namespace ui |
| OLD | NEW |