| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 layer_impl_id_(2) { | 125 layer_impl_id_(2) { |
| 126 std::unique_ptr<LayerImpl> root = | 126 std::unique_ptr<LayerImpl> root = |
| 127 LayerImpl::Create(host_->host_impl()->active_tree(), 1); | 127 LayerImpl::Create(host_->host_impl()->active_tree(), 1); |
| 128 host_->host_impl()->active_tree()->SetRootLayerForTesting(std::move(root)); | 128 host_->host_impl()->active_tree()->SetRootLayerForTesting(std::move(root)); |
| 129 root_layer_for_testing()->SetHasRenderSurface(true); | 129 root_layer_for_testing()->SetHasRenderSurface(true); |
| 130 host_->host_impl()->SetVisible(true); | 130 host_->host_impl()->SetVisible(true); |
| 131 EXPECT_TRUE(host_->host_impl()->InitializeRenderer(output_surface_.get())); | 131 EXPECT_TRUE(host_->host_impl()->InitializeRenderer(output_surface_.get())); |
| 132 | 132 |
| 133 const int timeline_id = AnimationIdProvider::NextTimelineId(); | 133 const int timeline_id = AnimationIdProvider::NextTimelineId(); |
| 134 timeline_ = AnimationTimeline::Create(timeline_id); | 134 timeline_ = AnimationTimeline::Create(timeline_id); |
| 135 host_->animation_host()->AddAnimationTimeline(timeline_); | 135 host_->GetLayerTree()->animation_host()->AddAnimationTimeline(timeline_); |
| 136 // Create impl-side instance. | 136 // Create impl-side instance. |
| 137 host_->animation_host()->PushPropertiesTo( | 137 host_->GetLayerTree()->animation_host()->PushPropertiesTo( |
| 138 host_->host_impl()->animation_host()); | 138 host_->host_impl()->animation_host()); |
| 139 timeline_impl_ = | 139 timeline_impl_ = |
| 140 host_->host_impl()->animation_host()->GetTimelineById(timeline_id); | 140 host_->host_impl()->animation_host()->GetTimelineById(timeline_id); |
| 141 } | 141 } |
| 142 | 142 |
| 143 LayerTestCommon::LayerImplTest::~LayerImplTest() { | 143 LayerTestCommon::LayerImplTest::~LayerImplTest() { |
| 144 host_->animation_host()->RemoveAnimationTimeline(timeline_); | 144 host_->GetLayerTree()->animation_host()->RemoveAnimationTimeline(timeline_); |
| 145 timeline_ = nullptr; | 145 timeline_ = nullptr; |
| 146 host_->host_impl()->ReleaseOutputSurface(); | 146 host_->host_impl()->ReleaseOutputSurface(); |
| 147 } | 147 } |
| 148 | 148 |
| 149 void LayerTestCommon::LayerImplTest::CalcDrawProps( | 149 void LayerTestCommon::LayerImplTest::CalcDrawProps( |
| 150 const gfx::Size& viewport_size) { | 150 const gfx::Size& viewport_size) { |
| 151 LayerImplList layer_list; | 151 LayerImplList layer_list; |
| 152 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( | 152 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
| 153 root_layer_for_testing(), viewport_size, &layer_list); | 153 root_layer_for_testing(), viewport_size, &layer_list); |
| 154 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); | 154 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 } | 205 } |
| 206 | 206 |
| 207 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} | 207 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} |
| 208 | 208 |
| 209 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { | 209 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { |
| 210 root_layer_for_testing()->test_properties()->copy_requests.push_back( | 210 root_layer_for_testing()->test_properties()->copy_requests.push_back( |
| 211 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); | 211 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); |
| 212 } | 212 } |
| 213 | 213 |
| 214 } // namespace cc | 214 } // namespace cc |
| OLD | NEW |