OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 UI_COMPOSITOR_TEST_DRAW_WAITER_H_ | 5 #ifndef UI_COMPOSITOR_TEST_DRAW_WAITER_H_ |
6 #define UI_COMPOSITOR_TEST_DRAW_WAITER_H_ | 6 #define UI_COMPOSITOR_TEST_DRAW_WAITER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
11 #include "ui/compositor/compositor_observer.h" | 12 #include "ui/compositor/compositor_observer.h" |
12 | 13 |
13 class Compositor; | 14 class Compositor; |
14 | 15 |
15 namespace ui { | 16 namespace ui { |
16 | 17 |
17 // This is only to be used for test. It allows execution of other tasks on | 18 // This is only to be used for test. It allows execution of other tasks on |
18 // the current message loop before the current task finishs (there is a | 19 // the current message loop before the current task finishs (there is a |
19 // potential for re-entrancy). | 20 // potential for re-entrancy). |
(...skipping 23 matching lines...) Expand all Loading... |
43 | 44 |
44 // CompositorObserver implementation. | 45 // CompositorObserver implementation. |
45 void OnCompositingDidCommit(Compositor* compositor) override; | 46 void OnCompositingDidCommit(Compositor* compositor) override; |
46 void OnCompositingStarted(Compositor* compositor, | 47 void OnCompositingStarted(Compositor* compositor, |
47 base::TimeTicks start_time) override; | 48 base::TimeTicks start_time) override; |
48 void OnCompositingEnded(Compositor* compositor) override; | 49 void OnCompositingEnded(Compositor* compositor) override; |
49 void OnCompositingAborted(Compositor* compositor) override; | 50 void OnCompositingAborted(Compositor* compositor) override; |
50 void OnCompositingLockStateChanged(Compositor* compositor) override; | 51 void OnCompositingLockStateChanged(Compositor* compositor) override; |
51 void OnCompositingShuttingDown(Compositor* compositor) override; | 52 void OnCompositingShuttingDown(Compositor* compositor) override; |
52 | 53 |
53 scoped_ptr<base::RunLoop> wait_run_loop_; | 54 std::unique_ptr<base::RunLoop> wait_run_loop_; |
54 | 55 |
55 WaitEvent wait_event_; | 56 WaitEvent wait_event_; |
56 | 57 |
57 DISALLOW_COPY_AND_ASSIGN(DrawWaiterForTest); | 58 DISALLOW_COPY_AND_ASSIGN(DrawWaiterForTest); |
58 }; | 59 }; |
59 | 60 |
60 } // namespace ui | 61 } // namespace ui |
61 | 62 |
62 #endif // UI_COMPOSITOR_TEST_DRAW_WAITER_H_ | 63 #endif // UI_COMPOSITOR_TEST_DRAW_WAITER_H_ |
OLD | NEW |