| 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 #include "cc/test/layer_tree_test_common.h" | 5 #include "cc/test/layer_tree_test_common.h" |
| 6 | 6 |
| 7 #include "cc/animation.h" | 7 #include "cc/animation.h" |
| 8 #include "cc/animation_registrar.h" | 8 #include "cc/animation_registrar.h" |
| 9 #include "cc/content_layer.h" | 9 #include "cc/content_layer.h" |
| 10 #include "cc/input_handler.h" | 10 #include "cc/input_handler.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 scoped_refptr<cc::ContextProvider> TestHooks::OffscreenContextProviderForMainThr
ead() | 56 scoped_refptr<cc::ContextProvider> TestHooks::OffscreenContextProviderForMainThr
ead() |
| 57 { | 57 { |
| 58 return m_fakeClient->OffscreenContextProviderForMainThread(); | 58 return m_fakeClient->OffscreenContextProviderForMainThread(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 scoped_refptr<cc::ContextProvider> TestHooks::OffscreenContextProviderForComposi
torThread() | 61 scoped_refptr<cc::ContextProvider> TestHooks::OffscreenContextProviderForComposi
torThread() |
| 62 { | 62 { |
| 63 return m_fakeClient->OffscreenContextProviderForCompositorThread(); | 63 return m_fakeClient->OffscreenContextProviderForCompositorThread(); |
| 64 } | 64 } |
| 65 | 65 |
| 66 scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testH
ooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy*
proxy) | 66 scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testH
ooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy*
proxy, RenderingStatsRecorder* renderingStatsRecorder) |
| 67 { | 67 { |
| 68 return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client
, proxy)); | 68 return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client
, proxy, renderingStatsRecorder)); |
| 69 } | 69 } |
| 70 | 70 |
| 71 void MockLayerTreeHostImpl::beginCommit() | 71 void MockLayerTreeHostImpl::beginCommit() |
| 72 { | 72 { |
| 73 LayerTreeHostImpl::beginCommit(); | 73 LayerTreeHostImpl::beginCommit(); |
| 74 m_testHooks->beginCommitOnThread(this); | 74 m_testHooks->beginCommitOnThread(this); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void MockLayerTreeHostImpl::commitComplete() | 77 void MockLayerTreeHostImpl::commitComplete() |
| 78 { | 78 { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 } | 144 } |
| 145 } | 145 } |
| 146 m_testHooks->updateAnimationState(this, hasUnfinishedAnimation); | 146 m_testHooks->updateAnimationState(this, hasUnfinishedAnimation); |
| 147 } | 147 } |
| 148 | 148 |
| 149 base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const | 149 base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const |
| 150 { | 150 { |
| 151 return base::TimeDelta::FromMilliseconds(16); | 151 return base::TimeDelta::FromMilliseconds(16); |
| 152 } | 152 } |
| 153 | 153 |
| 154 MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTr
eeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy) | 154 MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTr
eeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy, RenderingSt
atsRecorder* renderingStatsRecorder) |
| 155 : LayerTreeHostImpl(settings, client, proxy) | 155 : LayerTreeHostImpl(settings, client, proxy, renderingStatsRecorder) |
| 156 , m_testHooks(testHooks) | 156 , m_testHooks(testHooks) |
| 157 { | 157 { |
| 158 } | 158 } |
| 159 | 159 |
| 160 // Adapts LayerTreeHost for test. Injects MockLayerTreeHostImpl. | 160 // Adapts LayerTreeHost for test. Injects MockLayerTreeHostImpl. |
| 161 class MockLayerTreeHost : public cc::LayerTreeHost { | 161 class MockLayerTreeHost : public cc::LayerTreeHost { |
| 162 public: | 162 public: |
| 163 static scoped_ptr<MockLayerTreeHost> create(TestHooks* testHooks, cc::LayerT
reeHostClient* client, const cc::LayerTreeSettings& settings, scoped_ptr<cc::Thr
ead> implThread) | 163 static scoped_ptr<MockLayerTreeHost> create(TestHooks* testHooks, cc::LayerT
reeHostClient* client, const cc::LayerTreeSettings& settings, scoped_ptr<cc::Thr
ead> implThread) |
| 164 { | 164 { |
| 165 scoped_ptr<MockLayerTreeHost> layerTreeHost(new MockLayerTreeHost(testHo
oks, client, settings)); | 165 scoped_ptr<MockLayerTreeHost> layerTreeHost(new MockLayerTreeHost(testHo
oks, client, settings)); |
| 166 bool success = layerTreeHost->initialize(implThread.Pass()); | 166 bool success = layerTreeHost->initialize(implThread.Pass()); |
| 167 EXPECT_TRUE(success); | 167 EXPECT_TRUE(success); |
| 168 return layerTreeHost.Pass(); | 168 return layerTreeHost.Pass(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerT
reeHostImplClient* client) OVERRIDE | 171 virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerT
reeHostImplClient* client) OVERRIDE |
| 172 { | 172 { |
| 173 return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, pr
oxy()).PassAs<cc::LayerTreeHostImpl>(); | 173 return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, pr
oxy(), renderingStatsRecorder()).PassAs<cc::LayerTreeHostImpl>(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 virtual void setNeedsCommit() OVERRIDE | 176 virtual void setNeedsCommit() OVERRIDE |
| 177 { | 177 { |
| 178 if (!m_testStarted) | 178 if (!m_testStarted) |
| 179 return; | 179 return; |
| 180 LayerTreeHost::setNeedsCommit(); | 180 LayerTreeHost::setNeedsCommit(); |
| 181 } | 181 } |
| 182 | 182 |
| 183 void setTestStarted(bool started) { m_testStarted = started; } | 183 void setTestStarted(bool started) { m_testStarted = started; } |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 514 ASSERT_FALSE(m_layerTreeHost.get()); | 514 ASSERT_FALSE(m_layerTreeHost.get()); |
| 515 m_client.reset(); | 515 m_client.reset(); |
| 516 if (m_timedOut) { | 516 if (m_timedOut) { |
| 517 FAIL() << "Test timed out"; | 517 FAIL() << "Test timed out"; |
| 518 return; | 518 return; |
| 519 } | 519 } |
| 520 afterTest(); | 520 afterTest(); |
| 521 } | 521 } |
| 522 | 522 |
| 523 } // namespace cc | 523 } // namespace cc |
| OLD | NEW |