| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/test/layer_tree_test_common.h" | 7 #include "cc/test/layer_tree_test_common.h" |
| 8 | 8 |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "cc/active_animation.h" | 10 #include "cc/active_animation.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 class MockLayerTreeHost : public cc::LayerTreeHost { | 142 class MockLayerTreeHost : public cc::LayerTreeHost { |
| 143 public: | 143 public: |
| 144 static scoped_ptr<MockLayerTreeHost> create(TestHooks* testHooks, cc::LayerT
reeHostClient* client, scoped_refptr<cc::Layer> rootLayer, const cc::LayerTreeSe
ttings& settings) | 144 static scoped_ptr<MockLayerTreeHost> create(TestHooks* testHooks, cc::LayerT
reeHostClient* client, scoped_refptr<cc::Layer> rootLayer, const cc::LayerTreeSe
ttings& settings) |
| 145 { | 145 { |
| 146 scoped_ptr<MockLayerTreeHost> layerTreeHost(new MockLayerTreeHost(testHo
oks, client, settings)); | 146 scoped_ptr<MockLayerTreeHost> layerTreeHost(new MockLayerTreeHost(testHo
oks, client, settings)); |
| 147 bool success = layerTreeHost->initialize(); | 147 bool success = layerTreeHost->initialize(); |
| 148 EXPECT_TRUE(success); | 148 EXPECT_TRUE(success); |
| 149 layerTreeHost->setRootLayer(rootLayer); | 149 layerTreeHost->setRootLayer(rootLayer); |
| 150 | 150 |
| 151 // LayerTreeHostImpl won't draw if it has 1x1 viewport. | 151 // LayerTreeHostImpl won't draw if it has 1x1 viewport. |
| 152 layerTreeHost->setViewportSize(IntSize(1, 1), IntSize(1, 1)); | 152 layerTreeHost->setViewportSize(gfx::Size(1, 1), gfx::Size(1, 1)); |
| 153 | 153 |
| 154 layerTreeHost->rootLayer()->setLayerAnimationDelegate(testHooks); | 154 layerTreeHost->rootLayer()->setLayerAnimationDelegate(testHooks); |
| 155 | 155 |
| 156 return layerTreeHost.Pass(); | 156 return layerTreeHost.Pass(); |
| 157 } | 157 } |
| 158 | 158 |
| 159 virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerT
reeHostImplClient* client) | 159 virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerT
reeHostImplClient* client) |
| 160 { | 160 { |
| 161 return MockLayerTreeHostImpl::create(m_testHooks, settings(), client).Pa
ssAs<cc::LayerTreeHostImpl>(); | 161 return MockLayerTreeHostImpl::create(m_testHooks, settings(), client).Pa
ssAs<cc::LayerTreeHostImpl>(); |
| 162 } | 162 } |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 ASSERT_FALSE(m_layerTreeHost.get()); | 529 ASSERT_FALSE(m_layerTreeHost.get()); |
| 530 m_client.reset(); | 530 m_client.reset(); |
| 531 if (m_timedOut) { | 531 if (m_timedOut) { |
| 532 FAIL() << "Test timed out"; | 532 FAIL() << "Test timed out"; |
| 533 return; | 533 return; |
| 534 } | 534 } |
| 535 afterTest(); | 535 afterTest(); |
| 536 } | 536 } |
| 537 | 537 |
| 538 } // namespace WebKitTests | 538 } // namespace WebKitTests |
| OLD | NEW |