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 "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "cc/animation/keyframed_animation_curve.h" | 8 #include "cc/animation/keyframed_animation_curve.h" |
9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
10 #include "cc/layers/layer_impl.h" | 10 #include "cc/layers/layer_impl.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 LayerTest() | 66 LayerTest() |
67 : host_impl_(&proxy_, &shared_bitmap_manager_, &task_graph_runner_), | 67 : host_impl_(&proxy_, &shared_bitmap_manager_, &task_graph_runner_), |
68 fake_client_(FakeLayerTreeHostClient::DIRECT_3D) {} | 68 fake_client_(FakeLayerTreeHostClient::DIRECT_3D) {} |
69 | 69 |
70 protected: | 70 protected: |
71 void SetUp() override { | 71 void SetUp() override { |
72 LayerTreeHost::InitParams params; | 72 LayerTreeHost::InitParams params; |
73 LayerTreeSettings settings; | 73 LayerTreeSettings settings; |
74 params.client = &fake_client_; | 74 params.client = &fake_client_; |
75 params.settings = &settings; | 75 params.settings = &settings; |
| 76 params.task_graph_runner = &task_graph_runner_; |
76 layer_tree_host_.reset( | 77 layer_tree_host_.reset( |
77 new StrictMock<MockLayerTreeHost>(&fake_client_, ¶ms)); | 78 new StrictMock<MockLayerTreeHost>(&fake_client_, ¶ms)); |
78 } | 79 } |
79 | 80 |
80 void TearDown() override { | 81 void TearDown() override { |
81 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); | 82 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); |
82 EXPECT_CALL(*layer_tree_host_, SetNeedsFullTreeSync()).Times(AnyNumber()); | 83 EXPECT_CALL(*layer_tree_host_, SetNeedsFullTreeSync()).Times(AnyNumber()); |
83 parent_ = nullptr; | 84 parent_ = nullptr; |
84 child1_ = nullptr; | 85 child1_ = nullptr; |
85 child2_ = nullptr; | 86 child2_ = nullptr; |
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
934 ->OnTransformAnimated(singular_transform); | 935 ->OnTransformAnimated(singular_transform); |
935 layer->PushPropertiesTo(impl_layer.get()); | 936 layer->PushPropertiesTo(impl_layer.get()); |
936 EXPECT_FALSE(layer->transform_is_invertible()); | 937 EXPECT_FALSE(layer->transform_is_invertible()); |
937 EXPECT_FALSE(impl_layer->transform_is_invertible()); | 938 EXPECT_FALSE(impl_layer->transform_is_invertible()); |
938 | 939 |
939 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); | 940 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); |
940 } | 941 } |
941 | 942 |
942 class LayerTreeHostFactory { | 943 class LayerTreeHostFactory { |
943 public: | 944 public: |
944 LayerTreeHostFactory() | 945 LayerTreeHostFactory() : client_(FakeLayerTreeHostClient::DIRECT_3D) {} |
945 : client_(FakeLayerTreeHostClient::DIRECT_3D), | |
946 shared_bitmap_manager_(new TestSharedBitmapManager), | |
947 gpu_memory_buffer_manager_(new TestGpuMemoryBufferManager) {} | |
948 | 946 |
949 scoped_ptr<LayerTreeHost> Create() { return Create(LayerTreeSettings()); } | 947 scoped_ptr<LayerTreeHost> Create() { return Create(LayerTreeSettings()); } |
950 | 948 |
951 scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { | 949 scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { |
952 LayerTreeHost::InitParams params; | 950 LayerTreeHost::InitParams params; |
953 params.client = &client_; | 951 params.client = &client_; |
954 params.shared_bitmap_manager = shared_bitmap_manager_.get(); | 952 params.shared_bitmap_manager = &shared_bitmap_manager_; |
955 params.gpu_memory_buffer_manager = gpu_memory_buffer_manager_.get(); | 953 params.task_graph_runner = &task_graph_runner_; |
| 954 params.gpu_memory_buffer_manager = &gpu_memory_buffer_manager_; |
956 params.settings = &settings; | 955 params.settings = &settings; |
957 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); | 956 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
958 return LayerTreeHost::CreateSingleThreaded(&client_, ¶ms); | 957 return LayerTreeHost::CreateSingleThreaded(&client_, ¶ms); |
959 } | 958 } |
960 | 959 |
961 private: | 960 private: |
962 FakeLayerTreeHostClient client_; | 961 FakeLayerTreeHostClient client_; |
963 scoped_ptr<TestSharedBitmapManager> shared_bitmap_manager_; | 962 TestSharedBitmapManager shared_bitmap_manager_; |
964 scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_; | 963 TestTaskGraphRunner task_graph_runner_; |
| 964 TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
965 }; | 965 }; |
966 | 966 |
967 void AssertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host) { | 967 void AssertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host) { |
968 EXPECT_EQ(host, layer->layer_tree_host()); | 968 EXPECT_EQ(host, layer->layer_tree_host()); |
969 | 969 |
970 for (size_t i = 0; i < layer->children().size(); ++i) | 970 for (size_t i = 0; i < layer->children().size(); ++i) |
971 AssertLayerTreeHostMatchesForSubtree(layer->children()[i].get(), host); | 971 AssertLayerTreeHostMatchesForSubtree(layer->children()[i].get(), host); |
972 | 972 |
973 if (layer->mask_layer()) | 973 if (layer->mask_layer()) |
974 AssertLayerTreeHostMatchesForSubtree(layer->mask_layer(), host); | 974 AssertLayerTreeHostMatchesForSubtree(layer->mask_layer(), host); |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1331 // When the layer is destroyed, the other three requests should be aborted. | 1331 // When the layer is destroyed, the other three requests should be aborted. |
1332 layer = nullptr; | 1332 layer = nullptr; |
1333 EXPECT_EQ(1, did_receive_first_result_from_this_source); | 1333 EXPECT_EQ(1, did_receive_first_result_from_this_source); |
1334 EXPECT_EQ(1, did_receive_result_from_different_source); | 1334 EXPECT_EQ(1, did_receive_result_from_different_source); |
1335 EXPECT_EQ(1, did_receive_result_from_anonymous_source); | 1335 EXPECT_EQ(1, did_receive_result_from_anonymous_source); |
1336 EXPECT_EQ(1, did_receive_second_result_from_this_source); | 1336 EXPECT_EQ(1, did_receive_second_result_from_this_source); |
1337 } | 1337 } |
1338 | 1338 |
1339 } // namespace | 1339 } // namespace |
1340 } // namespace cc | 1340 } // namespace cc |
OLD | NEW |