| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 public: | 148 public: |
| 149 static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const cc::LayerT
reeSettings&, cc::LayerTreeHostImplClient*, cc::Proxy*); | 149 static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const cc::LayerT
reeSettings&, cc::LayerTreeHostImplClient*, cc::Proxy*); |
| 150 | 150 |
| 151 virtual void beginCommit() OVERRIDE; | 151 virtual void beginCommit() OVERRIDE; |
| 152 virtual void commitComplete() OVERRIDE; | 152 virtual void commitComplete() OVERRIDE; |
| 153 virtual bool prepareToDraw(FrameData&) OVERRIDE; | 153 virtual bool prepareToDraw(FrameData&) OVERRIDE; |
| 154 virtual void drawLayers(FrameData&) OVERRIDE; | 154 virtual void drawLayers(FrameData&) OVERRIDE; |
| 155 | 155 |
| 156 // Make these public. | 156 // Make these public. |
| 157 typedef std::vector<cc::LayerImpl*> LayerList; | 157 typedef std::vector<cc::LayerImpl*> LayerList; |
| 158 using LayerTreeHostImpl::calculateRenderSurfaceLayerList; | |
| 159 | 158 |
| 160 protected: | 159 protected: |
| 161 virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClo
ckTime) OVERRIDE; | 160 virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClo
ckTime) OVERRIDE; |
| 162 virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE; | 161 virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE; |
| 163 | 162 |
| 164 private: | 163 private: |
| 165 MockLayerTreeHostImpl(TestHooks*, const cc::LayerTreeSettings&, cc::LayerTre
eHostImplClient*, cc::Proxy*); | 164 MockLayerTreeHostImpl(TestHooks*, const cc::LayerTreeSettings&, cc::LayerTre
eHostImplClient*, cc::Proxy*); |
| 166 | 165 |
| 167 TestHooks* m_testHooks; | 166 TestHooks* m_testHooks; |
| 168 }; | 167 }; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 199 TEST_F(TEST_FIXTURE_NAME, runSingleThread) \ | 198 TEST_F(TEST_FIXTURE_NAME, runSingleThread) \ |
| 200 { \ | 199 { \ |
| 201 runTest(false); \ | 200 runTest(false); \ |
| 202 } \ | 201 } \ |
| 203 TEST_F(TEST_FIXTURE_NAME, runMultiThread) \ | 202 TEST_F(TEST_FIXTURE_NAME, runMultiThread) \ |
| 204 { \ | 203 { \ |
| 205 runTest(true); \ | 204 runTest(true); \ |
| 206 } | 205 } |
| 207 | 206 |
| 208 #endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_ | 207 #endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_ |
| OLD | NEW |