| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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_test_common.h" | 5 #include "cc/test/layer_test_common.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "cc/animation/animation_host.h" | 9 #include "cc/animation/animation_host.h" |
| 10 #include "cc/animation/animation_id_provider.h" | 10 #include "cc/animation/animation_id_provider.h" |
| 11 #include "cc/animation/animation_player.h" | 11 #include "cc/animation/animation_player.h" |
| 12 #include "cc/base/math_util.h" | 12 #include "cc/base/math_util.h" |
| 13 #include "cc/base/region.h" | 13 #include "cc/base/region.h" |
| 14 #include "cc/layers/append_quads_data.h" | 14 #include "cc/layers/append_quads_data.h" |
| 15 #include "cc/output/copy_output_request.h" | 15 #include "cc/output/copy_output_request.h" |
| 16 #include "cc/output/copy_output_result.h" | 16 #include "cc/output/copy_output_result.h" |
| 17 #include "cc/quads/draw_quad.h" | 17 #include "cc/quads/draw_quad.h" |
| 18 #include "cc/quads/render_pass.h" | 18 #include "cc/quads/render_pass.h" |
| 19 #include "cc/test/animation_test_common.h" | 19 #include "cc/test/animation_test_common.h" |
| 20 #include "cc/test/fake_output_surface.h" | 20 #include "cc/test/fake_output_surface.h" |
| 21 #include "cc/test/layer_tree_settings_for_testing.h" |
| 21 #include "cc/test/mock_occlusion_tracker.h" | 22 #include "cc/test/mock_occlusion_tracker.h" |
| 22 #include "cc/trees/layer_tree_host_common.h" | 23 #include "cc/trees/layer_tree_host_common.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
| 24 #include "ui/gfx/geometry/point_conversions.h" | 25 #include "ui/gfx/geometry/point_conversions.h" |
| 25 #include "ui/gfx/geometry/rect.h" | 26 #include "ui/gfx/geometry/rect.h" |
| 26 #include "ui/gfx/geometry/rect_conversions.h" | 27 #include "ui/gfx/geometry/rect_conversions.h" |
| 27 #include "ui/gfx/geometry/size_conversions.h" | 28 #include "ui/gfx/geometry/size_conversions.h" |
| 28 | 29 |
| 29 namespace cc { | 30 namespace cc { |
| 30 | 31 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 EXPECT_EQ(quad->rect.ToString(), quad->visible_rect.ToString()); | 111 EXPECT_EQ(quad->rect.ToString(), quad->visible_rect.ToString()); |
| 111 } else { | 112 } else { |
| 112 EXPECT_NE(quad->rect.ToString(), quad->visible_rect.ToString()); | 113 EXPECT_NE(quad->rect.ToString(), quad->visible_rect.ToString()); |
| 113 EXPECT_TRUE(quad->rect.Contains(quad->visible_rect)); | 114 EXPECT_TRUE(quad->rect.Contains(quad->visible_rect)); |
| 114 ++(*partially_occluded_count); | 115 ++(*partially_occluded_count); |
| 115 } | 116 } |
| 116 } | 117 } |
| 117 } | 118 } |
| 118 | 119 |
| 119 LayerTestCommon::LayerImplTest::LayerImplTest() | 120 LayerTestCommon::LayerImplTest::LayerImplTest() |
| 120 : LayerImplTest(LayerTreeSettings()) {} | 121 : LayerImplTest(LayerTreeSettingsForTesting()) {} |
| 121 | 122 |
| 122 LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings) | 123 LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings) |
| 123 : client_(FakeLayerTreeHostClient::DIRECT_3D), | 124 : client_(FakeLayerTreeHostClient::DIRECT_3D), |
| 124 output_surface_(FakeOutputSurface::Create3d()), | 125 output_surface_(FakeOutputSurface::Create3d()), |
| 125 host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)), | 126 host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)), |
| 126 render_pass_(RenderPass::Create()), | 127 render_pass_(RenderPass::Create()), |
| 127 layer_impl_id_(2) { | 128 layer_impl_id_(2) { |
| 128 std::unique_ptr<LayerImpl> root = | 129 std::unique_ptr<LayerImpl> root = |
| 129 LayerImpl::Create(host_->host_impl()->active_tree(), 1); | 130 LayerImpl::Create(host_->host_impl()->active_tree(), 1); |
| 130 host_->host_impl()->active_tree()->SetRootLayer(std::move(root)); | 131 host_->host_impl()->active_tree()->SetRootLayer(std::move(root)); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} | 209 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} |
| 209 | 210 |
| 210 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { | 211 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { |
| 211 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests; | 212 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests; |
| 212 copy_requests.push_back( | 213 copy_requests.push_back( |
| 213 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); | 214 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); |
| 214 root_layer()->PassCopyRequests(©_requests); | 215 root_layer()->PassCopyRequests(©_requests); |
| 215 } | 216 } |
| 216 | 217 |
| 217 } // namespace cc | 218 } // namespace cc |
| OLD | NEW |