| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 host_->host_impl()->active_tree()->SetRootLayer(std::move(root)); | 130 host_->host_impl()->active_tree()->SetRootLayer(std::move(root)); |
| 131 root_layer()->SetHasRenderSurface(true); | 131 root_layer()->SetHasRenderSurface(true); |
| 132 host_->host_impl()->SetVisible(true); | 132 host_->host_impl()->SetVisible(true); |
| 133 host_->host_impl()->InitializeRenderer(output_surface_.get()); | 133 host_->host_impl()->InitializeRenderer(output_surface_.get()); |
| 134 | 134 |
| 135 const int timeline_id = AnimationIdProvider::NextTimelineId(); | 135 const int timeline_id = AnimationIdProvider::NextTimelineId(); |
| 136 timeline_ = AnimationTimeline::Create(timeline_id); | 136 timeline_ = AnimationTimeline::Create(timeline_id); |
| 137 host_->animation_host()->AddAnimationTimeline(timeline_); | 137 host_->animation_host()->AddAnimationTimeline(timeline_); |
| 138 // Create impl-side instance. | 138 // Create impl-side instance. |
| 139 host_->animation_host()->PushPropertiesTo( | 139 host_->animation_host()->PushPropertiesTo( |
| 140 host_->host_impl()->animation_host()); | 140 host_->host_impl()->animation_host(), |
| 141 host_->host_impl()->CurrentBeginFrameArgs().frame_time); |
| 141 timeline_impl_ = | 142 timeline_impl_ = |
| 142 host_->host_impl()->animation_host()->GetTimelineById(timeline_id); | 143 host_->host_impl()->animation_host()->GetTimelineById(timeline_id); |
| 143 } | 144 } |
| 144 | 145 |
| 145 LayerTestCommon::LayerImplTest::~LayerImplTest() { | 146 LayerTestCommon::LayerImplTest::~LayerImplTest() { |
| 146 host_->animation_host()->RemoveAnimationTimeline(timeline_); | 147 host_->animation_host()->RemoveAnimationTimeline(timeline_); |
| 147 timeline_ = nullptr; | 148 timeline_ = nullptr; |
| 148 } | 149 } |
| 149 | 150 |
| 150 void LayerTestCommon::LayerImplTest::CalcDrawProps( | 151 void LayerTestCommon::LayerImplTest::CalcDrawProps( |
| (...skipping 57 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 |