| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 public: | 146 public: |
| 147 static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const LayerTreeS
ettings&, LayerTreeHostImplClient*, Proxy*); | 147 static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const LayerTreeS
ettings&, LayerTreeHostImplClient*, Proxy*); |
| 148 | 148 |
| 149 virtual void beginCommit() OVERRIDE; | 149 virtual void beginCommit() OVERRIDE; |
| 150 virtual void commitComplete() OVERRIDE; | 150 virtual void commitComplete() OVERRIDE; |
| 151 virtual bool prepareToDraw(FrameData&) OVERRIDE; | 151 virtual bool prepareToDraw(FrameData&) OVERRIDE; |
| 152 virtual void drawLayers(FrameData&) OVERRIDE; | 152 virtual void drawLayers(FrameData&) OVERRIDE; |
| 153 | 153 |
| 154 // Make these public. | 154 // Make these public. |
| 155 typedef std::vector<LayerImpl*> LayerList; | 155 typedef std::vector<LayerImpl*> LayerList; |
| 156 using LayerTreeHostImpl::calculateRenderSurfaceLayerList; | |
| 157 | 156 |
| 158 protected: | 157 protected: |
| 159 virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClo
ckTime) OVERRIDE; | 158 virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClo
ckTime) OVERRIDE; |
| 160 virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE; | 159 virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE; |
| 161 | 160 |
| 162 private: | 161 private: |
| 163 MockLayerTreeHostImpl(TestHooks*, const LayerTreeSettings&, LayerTreeHostImp
lClient*, Proxy*); | 162 MockLayerTreeHostImpl(TestHooks*, const LayerTreeSettings&, LayerTreeHostImp
lClient*, Proxy*); |
| 164 | 163 |
| 165 TestHooks* m_testHooks; | 164 TestHooks* m_testHooks; |
| 166 }; | 165 }; |
| (...skipping 30 matching lines...) Expand all 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 |