OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/delegated_renderer_layer.h" | 5 #include "cc/layers/delegated_renderer_layer.h" |
6 | 6 |
7 #include "cc/layers/delegated_frame_provider.h" | 7 #include "cc/layers/delegated_frame_provider.h" |
8 #include "cc/layers/delegated_frame_resource_collection.h" | 8 #include "cc/layers/delegated_frame_resource_collection.h" |
9 #include "cc/layers/solid_color_layer.h" | 9 #include "cc/layers/solid_color_layer.h" |
10 #include "cc/output/delegated_frame_data.h" | 10 #include "cc/output/delegated_frame_data.h" |
11 #include "cc/test/fake_delegated_renderer_layer.h" | 11 #include "cc/test/fake_delegated_renderer_layer.h" |
12 #include "cc/test/fake_layer_tree_host.h" | 12 #include "cc/test/fake_layer_tree_host.h" |
13 #include "cc/test/fake_proxy.h" | 13 #include "cc/test/fake_proxy.h" |
| 14 #include "cc/test/test_task_graph_runner.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
15 | 16 |
16 namespace cc { | 17 namespace cc { |
17 namespace { | 18 namespace { |
18 | 19 |
19 class DelegatedRendererLayerTest : public testing::Test { | 20 class DelegatedRendererLayerTest : public testing::Test { |
20 public: | 21 public: |
21 DelegatedRendererLayerTest() | 22 DelegatedRendererLayerTest() |
22 : proxy_(), host_client_(FakeLayerTreeHostClient::DIRECT_3D) { | 23 : proxy_(), host_client_(FakeLayerTreeHostClient::DIRECT_3D) { |
23 LayerTreeSettings settings; | 24 LayerTreeSettings settings; |
24 settings.minimum_occlusion_tracking_size = gfx::Size(); | 25 settings.minimum_occlusion_tracking_size = gfx::Size(); |
25 | 26 |
26 host_impl_ = FakeLayerTreeHost::Create(&host_client_, settings); | 27 host_impl_ = |
| 28 FakeLayerTreeHost::Create(&host_client_, &task_graph_runner_, settings); |
27 host_impl_->SetViewportSize(gfx::Size(10, 10)); | 29 host_impl_->SetViewportSize(gfx::Size(10, 10)); |
28 } | 30 } |
29 | 31 |
30 protected: | 32 protected: |
31 FakeProxy proxy_; | 33 FakeProxy proxy_; |
32 FakeLayerTreeHostClient host_client_; | 34 FakeLayerTreeHostClient host_client_; |
| 35 TestTaskGraphRunner task_graph_runner_; |
33 TestSharedBitmapManager shared_bitmap_manager_; | 36 TestSharedBitmapManager shared_bitmap_manager_; |
34 scoped_ptr<LayerTreeHost> host_impl_; | 37 scoped_ptr<LayerTreeHost> host_impl_; |
35 }; | 38 }; |
36 | 39 |
37 class DelegatedRendererLayerTestSimple : public DelegatedRendererLayerTest { | 40 class DelegatedRendererLayerTestSimple : public DelegatedRendererLayerTest { |
38 public: | 41 public: |
39 DelegatedRendererLayerTestSimple() : DelegatedRendererLayerTest() { | 42 DelegatedRendererLayerTestSimple() : DelegatedRendererLayerTest() { |
40 scoped_ptr<RenderPass> root_pass(RenderPass::Create()); | 43 scoped_ptr<RenderPass> root_pass(RenderPass::Create()); |
41 root_pass->SetNew( | 44 root_pass->SetNew( |
42 RenderPassId(1, 1), gfx::Rect(1, 1), gfx::Rect(1, 1), gfx::Transform()); | 45 RenderPassId(1, 1), gfx::Rect(1, 1), gfx::Rect(1, 1), gfx::Transform()); |
(...skipping 28 matching lines...) Expand all Loading... |
71 EXPECT_EQ(0, delegated_renderer_layer_->NumDescendantsThatDrawContent()); | 74 EXPECT_EQ(0, delegated_renderer_layer_->NumDescendantsThatDrawContent()); |
72 EXPECT_EQ(1, root_layer_->NumDescendantsThatDrawContent()); | 75 EXPECT_EQ(1, root_layer_->NumDescendantsThatDrawContent()); |
73 delegated_renderer_layer_->SetIsDrawable(true); | 76 delegated_renderer_layer_->SetIsDrawable(true); |
74 EXPECT_EQ(1000, delegated_renderer_layer_->NumDescendantsThatDrawContent()); | 77 EXPECT_EQ(1000, delegated_renderer_layer_->NumDescendantsThatDrawContent()); |
75 EXPECT_EQ(1001, layer_before_->NumDescendantsThatDrawContent()); | 78 EXPECT_EQ(1001, layer_before_->NumDescendantsThatDrawContent()); |
76 EXPECT_EQ(1002, root_layer_->NumDescendantsThatDrawContent()); | 79 EXPECT_EQ(1002, root_layer_->NumDescendantsThatDrawContent()); |
77 } | 80 } |
78 | 81 |
79 } // namespace | 82 } // namespace |
80 } // namespace cc | 83 } // namespace cc |
OLD | NEW |