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/aura/test/aura_test_helper.h" | 5 #include "ui/aura/test/aura_test_helper.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/default_activation_client.h" | |
11 #include "ui/aura/client/default_capture_client.h" | 10 #include "ui/aura/client/default_capture_client.h" |
12 #include "ui/aura/client/focus_client.h" | 11 #include "ui/aura/client/focus_client.h" |
13 #include "ui/aura/env.h" | 12 #include "ui/aura/env.h" |
14 #include "ui/aura/input_state_lookup.h" | 13 #include "ui/aura/input_state_lookup.h" |
15 #include "ui/aura/test/env_test_helper.h" | 14 #include "ui/aura/test/env_test_helper.h" |
16 #include "ui/aura/test/test_focus_client.h" | 15 #include "ui/aura/test/test_focus_client.h" |
17 #include "ui/aura/test/test_screen.h" | 16 #include "ui/aura/test/test_screen.h" |
18 #include "ui/aura/test/test_window_tree_client.h" | 17 #include "ui/aura/test/test_window_tree_client.h" |
19 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
20 #include "ui/base/ime/dummy_input_method.h" | 19 #include "ui/base/ime/dummy_input_method.h" |
21 #include "ui/base/ime/input_method_initializer.h" | 20 #include "ui/base/ime/input_method_initializer.h" |
22 #include "ui/compositor/compositor.h" | 21 #include "ui/compositor/compositor.h" |
23 #include "ui/compositor/layer_animator.h" | 22 #include "ui/compositor/layer_animator.h" |
24 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 23 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
25 #include "ui/gfx/screen.h" | 24 #include "ui/gfx/screen.h" |
26 | 25 |
27 #if defined(USE_X11) | 26 #if defined(USE_X11) |
28 #include "ui/aura/window_tree_host_x11.h" | 27 #include "ui/aura/window_tree_host_x11.h" |
29 #include "ui/base/x/x11_util.h" | 28 #include "ui/base/x/x11_util.h" |
30 #endif | 29 #endif |
31 | 30 |
32 namespace aura { | 31 namespace aura { |
33 namespace test { | 32 namespace test { |
34 | 33 |
35 AuraTestHelper::AuraTestHelper(base::MessageLoopForUI* message_loop) | 34 AuraTestHelper::AuraTestHelper(base::MessageLoopForUI* message_loop) |
36 : setup_called_(false), | 35 : default_window_size_(800, 600), |
| 36 setup_called_(false), |
37 teardown_called_(false), | 37 teardown_called_(false), |
38 owns_host_(false) { | 38 owns_host_(false) { |
39 DCHECK(message_loop); | 39 DCHECK(message_loop); |
40 message_loop_ = message_loop; | 40 message_loop_ = message_loop; |
41 // Disable animations during tests. | 41 // Disable animations during tests. |
42 zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( | 42 zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( |
43 ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); | 43 ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); |
44 #if defined(USE_X11) | 44 #if defined(USE_X11) |
45 test::SetUseOverrideRedirectWindowByDefault(true); | 45 test::SetUseOverrideRedirectWindowByDefault(true); |
46 #endif | 46 #endif |
(...skipping 17 matching lines...) Expand all Loading... |
64 | 64 |
65 ui::InitializeInputMethodForTesting(); | 65 ui::InitializeInputMethodForTesting(); |
66 | 66 |
67 test_screen_.reset(TestScreen::Create()); | 67 test_screen_.reset(TestScreen::Create()); |
68 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); | 68 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); |
69 host_.reset(test_screen_->CreateHostForPrimaryDisplay()); | 69 host_.reset(test_screen_->CreateHostForPrimaryDisplay()); |
70 | 70 |
71 focus_client_.reset(new TestFocusClient); | 71 focus_client_.reset(new TestFocusClient); |
72 client::SetFocusClient(root_window(), focus_client_.get()); | 72 client::SetFocusClient(root_window(), focus_client_.get()); |
73 stacking_client_.reset(new TestWindowTreeClient(root_window())); | 73 stacking_client_.reset(new TestWindowTreeClient(root_window())); |
74 activation_client_.reset( | |
75 new client::DefaultActivationClient(root_window())); | |
76 capture_client_.reset(new client::DefaultCaptureClient(root_window())); | 74 capture_client_.reset(new client::DefaultCaptureClient(root_window())); |
77 test_input_method_.reset(new ui::DummyInputMethod); | 75 test_input_method_.reset(new ui::DummyInputMethod); |
78 root_window()->SetProperty( | 76 root_window()->SetProperty( |
79 client::kRootWindowInputMethodKey, | 77 client::kRootWindowInputMethodKey, |
80 test_input_method_.get()); | 78 test_input_method_.get()); |
81 | 79 |
82 root_window()->Show(); | 80 root_window()->Show(); |
83 // Ensure width != height so tests won't confuse them. | 81 // Ensure width != height so tests won't confuse them. |
84 host()->SetBounds(gfx::Rect(800, 600)); | 82 host()->SetBounds(gfx::Rect(default_window_size_)); |
85 } | 83 } |
86 | 84 |
87 void AuraTestHelper::TearDown() { | 85 void AuraTestHelper::TearDown() { |
88 teardown_called_ = true; | 86 teardown_called_ = true; |
89 test_input_method_.reset(); | 87 test_input_method_.reset(); |
90 stacking_client_.reset(); | 88 stacking_client_.reset(); |
91 activation_client_.reset(); | |
92 capture_client_.reset(); | 89 capture_client_.reset(); |
93 focus_client_.reset(); | 90 focus_client_.reset(); |
94 client::SetFocusClient(root_window(), NULL); | 91 client::SetFocusClient(root_window(), NULL); |
95 host_.reset(); | 92 host_.reset(); |
96 ui::GestureRecognizer::Reset(); | 93 ui::GestureRecognizer::Reset(); |
97 test_screen_.reset(); | 94 test_screen_.reset(); |
98 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); | 95 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); |
99 | 96 |
100 #if defined(USE_X11) | 97 #if defined(USE_X11) |
101 ui::ResetXCursorCache(); | 98 ui::ResetXCursorCache(); |
102 #endif | 99 #endif |
103 | 100 |
104 ui::ShutdownInputMethodForTesting(); | 101 ui::ShutdownInputMethodForTesting(); |
105 | 102 |
106 Env::DeleteInstance(); | 103 Env::DeleteInstance(); |
107 } | 104 } |
108 | 105 |
109 void AuraTestHelper::RunAllPendingInMessageLoop() { | 106 void AuraTestHelper::RunAllPendingInMessageLoop() { |
110 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 107 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
111 // use run_loop.QuitClosure(). | 108 // use run_loop.QuitClosure(). |
112 base::RunLoop run_loop; | 109 base::RunLoop run_loop; |
113 run_loop.RunUntilIdle(); | 110 run_loop.RunUntilIdle(); |
114 } | 111 } |
115 | 112 |
116 } // namespace test | 113 } // namespace test |
117 } // namespace aura | 114 } // namespace aura |
OLD | NEW |