| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "core/dom/ScriptedAnimationController.h" | 5 #include "core/dom/ScriptedAnimationController.h" |
| 6 | 6 |
| 7 #include "core/dom/Document.h" | 7 #include "core/dom/Document.h" |
| 8 #include "core/dom/FrameRequestCallback.h" | 8 #include "core/dom/FrameRequestCallback.h" |
| 9 #include "core/events/Event.h" | 9 #include "core/events/Event.h" |
| 10 #include "core/events/EventListener.h" | 10 #include "core/events/EventListener.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| 45 class TaskOrderObserver { | 45 class TaskOrderObserver { |
| 46 public: | 46 public: |
| 47 std::unique_ptr<WTF::Closure> createTask(int id) { | 47 std::unique_ptr<WTF::Closure> createTask(int id) { |
| 48 return WTF::bind(&TaskOrderObserver::runTask, WTF::unretained(this), id); | 48 return WTF::bind(&TaskOrderObserver::runTask, WTF::unretained(this), id); |
| 49 } | 49 } |
| 50 const Vector<int>& order() const { return m_order; } | 50 const Vector<int>& order() const { return m_order; } |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 void runTask(int id) { m_order.append(id); } | 53 void runTask(int id) { m_order.push_back(id); } |
| 54 Vector<int> m_order; | 54 Vector<int> m_order; |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 } // anonymous namespace | 57 } // anonymous namespace |
| 58 | 58 |
| 59 TEST_F(ScriptedAnimationControllerTest, EnqueueOneTask) { | 59 TEST_F(ScriptedAnimationControllerTest, EnqueueOneTask) { |
| 60 TaskOrderObserver observer; | 60 TaskOrderObserver observer; |
| 61 | 61 |
| 62 controller().enqueueTask(observer.createTask(1)); | 62 controller().enqueueTask(observer.createTask(1)); |
| 63 EXPECT_EQ(0u, observer.order().size()); | 63 EXPECT_EQ(0u, observer.order().size()); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 controller().enqueueTask(observer.createTask(2)); | 176 controller().enqueueTask(observer.createTask(2)); |
| 177 EXPECT_EQ(0u, observer.order().size()); | 177 EXPECT_EQ(0u, observer.order().size()); |
| 178 | 178 |
| 179 controller().serviceScriptedAnimations(0); | 179 controller().serviceScriptedAnimations(0); |
| 180 EXPECT_EQ(2u, observer.order().size()); | 180 EXPECT_EQ(2u, observer.order().size()); |
| 181 EXPECT_EQ(2, observer.order()[0]); | 181 EXPECT_EQ(2, observer.order()[0]); |
| 182 EXPECT_EQ(1, observer.order()[1]); | 182 EXPECT_EQ(1, observer.order()[1]); |
| 183 } | 183 } |
| 184 | 184 |
| 185 } // namespace blink | 185 } // namespace blink |
| OLD | NEW |