OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 CC_TEST_LAYER_TREE_TEST_COMMON_H_ | 5 #ifndef CC_TEST_LAYER_TREE_TEST_COMMON_H_ |
6 #define CC_TEST_LAYER_TREE_TEST_COMMON_H_ | 6 #define CC_TEST_LAYER_TREE_TEST_COMMON_H_ |
7 | 7 |
8 #include "base/hash_tables.h" | 8 #include "base/hash_tables.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 scoped_ptr<MockLayerImplTreeHostClient> m_client; | 117 scoped_ptr<MockLayerImplTreeHostClient> m_client; |
118 scoped_ptr<LayerTreeHost> m_layerTreeHost; | 118 scoped_ptr<LayerTreeHost> m_layerTreeHost; |
119 | 119 |
120 protected: | 120 protected: |
121 scoped_refptr<ScopedThreadProxy> m_mainThreadProxy; | 121 scoped_refptr<ScopedThreadProxy> m_mainThreadProxy; |
122 | 122 |
123 private: | 123 private: |
124 bool m_beginning; | 124 bool m_beginning; |
125 bool m_endWhenBeginReturns; | 125 bool m_endWhenBeginReturns; |
126 bool m_timedOut; | 126 bool m_timedOut; |
127 bool m_finished; | |
128 bool m_scheduled; | 127 bool m_scheduled; |
129 bool m_started; | 128 bool m_started; |
130 | 129 |
131 scoped_ptr<Thread> m_mainCCThread; | 130 scoped_ptr<Thread> m_mainCCThread; |
132 scoped_ptr<base::Thread> m_implThread; | 131 scoped_ptr<base::Thread> m_implThread; |
133 base::CancelableClosure m_timeout; | 132 base::CancelableClosure m_timeout; |
134 }; | 133 }; |
135 | 134 |
136 class ThreadedTestThreadOnly : public ThreadedTest { | 135 class ThreadedTestThreadOnly : public ThreadedTest { |
137 public: | 136 public: |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 TEST_F(TEST_FIXTURE_NAME, runSingleThread) \ | 196 TEST_F(TEST_FIXTURE_NAME, runSingleThread) \ |
198 { \ | 197 { \ |
199 runTest(false); \ | 198 runTest(false); \ |
200 } \ | 199 } \ |
201 TEST_F(TEST_FIXTURE_NAME, runMultiThread) \ | 200 TEST_F(TEST_FIXTURE_NAME, runMultiThread) \ |
202 { \ | 201 { \ |
203 runTest(true); \ | 202 runTest(true); \ |
204 } | 203 } |
205 | 204 |
206 #endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_ | 205 #endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_ |
OLD | NEW |