| 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" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 154 } |
| 155 | 155 |
| 156 LayerTestCommon::LayerImplTest::~LayerImplTest() { | 156 LayerTestCommon::LayerImplTest::~LayerImplTest() { |
| 157 animation_host_->RemoveAnimationTimeline(timeline_); | 157 animation_host_->RemoveAnimationTimeline(timeline_); |
| 158 timeline_ = nullptr; | 158 timeline_ = nullptr; |
| 159 host_->host_impl()->ReleaseCompositorFrameSink(); | 159 host_->host_impl()->ReleaseCompositorFrameSink(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 void LayerTestCommon::LayerImplTest::CalcDrawProps( | 162 void LayerTestCommon::LayerImplTest::CalcDrawProps( |
| 163 const gfx::Size& viewport_size) { | 163 const gfx::Size& viewport_size) { |
| 164 LayerImplList layer_list; | 164 RenderSurfaceList render_surface_list; |
| 165 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( | 165 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
| 166 root_layer_for_testing(), viewport_size, &layer_list); | 166 root_layer_for_testing(), viewport_size, &render_surface_list); |
| 167 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); | 167 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); |
| 168 } | 168 } |
| 169 | 169 |
| 170 void LayerTestCommon::LayerImplTest::AppendQuadsWithOcclusion( | 170 void LayerTestCommon::LayerImplTest::AppendQuadsWithOcclusion( |
| 171 LayerImpl* layer_impl, | 171 LayerImpl* layer_impl, |
| 172 const gfx::Rect& occluded) { | 172 const gfx::Rect& occluded) { |
| 173 AppendQuadsData data; | 173 AppendQuadsData data; |
| 174 | 174 |
| 175 render_pass_->quad_list.clear(); | 175 render_pass_->quad_list.clear(); |
| 176 render_pass_->shared_quad_state_list.clear(); | 176 render_pass_->shared_quad_state_list.clear(); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 } | 217 } |
| 218 | 218 |
| 219 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} | 219 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} |
| 220 | 220 |
| 221 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { | 221 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { |
| 222 root_layer_for_testing()->test_properties()->copy_requests.push_back( | 222 root_layer_for_testing()->test_properties()->copy_requests.push_back( |
| 223 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); | 223 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); |
| 224 } | 224 } |
| 225 | 225 |
| 226 } // namespace cc | 226 } // namespace cc |
| OLD | NEW |