| 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/layers/layer.h" | 5 #include "cc/layers/layer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
| 10 #include "cc/animation/animation_host.h" | 10 #include "cc/animation/animation_host.h" |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 FakeLayerTreeHostClient fake_client_; | 365 FakeLayerTreeHostClient fake_client_; |
| 366 scoped_ptr<FakeLayerTreeHost> layer_tree_host_; | 366 scoped_ptr<FakeLayerTreeHost> layer_tree_host_; |
| 367 }; | 367 }; |
| 368 | 368 |
| 369 namespace { | 369 namespace { |
| 370 | 370 |
| 371 class MockLayerTreeHost : public LayerTreeHost { | 371 class MockLayerTreeHost : public LayerTreeHost { |
| 372 public: | 372 public: |
| 373 MockLayerTreeHost(LayerTreeHostSingleThreadClient* single_thread_client, | 373 MockLayerTreeHost(LayerTreeHostSingleThreadClient* single_thread_client, |
| 374 LayerTreeHost::InitParams* params) | 374 LayerTreeHost::InitParams* params) |
| 375 : LayerTreeHost(params, CompositorMode::SingleThreaded) { | 375 : LayerTreeHost(params, CompositorMode::SINGLE_THREADED) { |
| 376 InitializeSingleThreaded(single_thread_client, | 376 InitializeSingleThreaded(single_thread_client, |
| 377 base::ThreadTaskRunnerHandle::Get(), nullptr); | 377 base::ThreadTaskRunnerHandle::Get(), nullptr); |
| 378 } | 378 } |
| 379 | 379 |
| 380 MOCK_METHOD0(SetNeedsCommit, void()); | 380 MOCK_METHOD0(SetNeedsCommit, void()); |
| 381 MOCK_METHOD0(SetNeedsUpdateLayers, void()); | 381 MOCK_METHOD0(SetNeedsUpdateLayers, void()); |
| 382 MOCK_METHOD0(SetNeedsFullTreeSync, void()); | 382 MOCK_METHOD0(SetNeedsFullTreeSync, void()); |
| 383 }; | 383 }; |
| 384 | 384 |
| 385 class LayerTreeSettingsForLayerTest : public LayerTreeSettings { | 385 class LayerTreeSettingsForLayerTest : public LayerTreeSettings { |
| (...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2131 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); | 2131 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); |
| 2132 | 2132 |
| 2133 test_layer->PushPropertiesTo(impl_layer.get()); | 2133 test_layer->PushPropertiesTo(impl_layer.get()); |
| 2134 | 2134 |
| 2135 EXPECT_EQ(2lu, impl_layer->element_id()); | 2135 EXPECT_EQ(2lu, impl_layer->element_id()); |
| 2136 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); | 2136 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); |
| 2137 } | 2137 } |
| 2138 | 2138 |
| 2139 } // namespace | 2139 } // namespace |
| 2140 } // namespace cc | 2140 } // namespace cc |
| OLD | NEW |