Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1183)

Side by Side Diff: cc/test/layer_test_common.cc

Issue 2100353002: cc: DCHECK that the OutputSurface was released in ~LayerTreeHostImpl(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: released-outputsurface: . Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 : LayerImplTest(LayerTreeSettingsForTesting()) {} 119 : LayerImplTest(LayerTreeSettingsForTesting()) {}
120 120
121 LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings) 121 LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
122 : client_(FakeLayerTreeHostClient::DIRECT_3D), 122 : client_(FakeLayerTreeHostClient::DIRECT_3D),
123 output_surface_(FakeOutputSurface::Create3d()), 123 output_surface_(FakeOutputSurface::Create3d()),
124 host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)), 124 host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)),
125 render_pass_(RenderPass::Create()), 125 render_pass_(RenderPass::Create()),
126 layer_impl_id_(2) { 126 layer_impl_id_(2) {
127 std::unique_ptr<LayerImpl> root = 127 std::unique_ptr<LayerImpl> root =
128 LayerImpl::Create(host_->host_impl()->active_tree(), 1); 128 LayerImpl::Create(host_->host_impl()->active_tree(), 1);
129 root->SetHasRenderSurface(true);
129 host_->host_impl()->active_tree()->SetRootLayer(std::move(root)); 130 host_->host_impl()->active_tree()->SetRootLayer(std::move(root));
130 root_layer()->SetHasRenderSurface(true); 131 host_->host_impl()->active_tree()->BuildLayerListForTesting();
131 host_->host_impl()->SetVisible(true); 132 host_->host_impl()->SetVisible(true);
132 host_->host_impl()->InitializeRenderer(output_surface_.get()); 133 host_->host_impl()->InitializeRenderer(output_surface_.get());
133 134
134 const int timeline_id = AnimationIdProvider::NextTimelineId(); 135 const int timeline_id = AnimationIdProvider::NextTimelineId();
135 timeline_ = AnimationTimeline::Create(timeline_id); 136 timeline_ = AnimationTimeline::Create(timeline_id);
136 host_->animation_host()->AddAnimationTimeline(timeline_); 137 host_->animation_host()->AddAnimationTimeline(timeline_);
137 // Create impl-side instance. 138 // Create impl-side instance.
138 host_->animation_host()->PushPropertiesTo( 139 host_->animation_host()->PushPropertiesTo(
139 host_->host_impl()->animation_host()); 140 host_->host_impl()->animation_host());
140 timeline_impl_ = 141 timeline_impl_ =
141 host_->host_impl()->animation_host()->GetTimelineById(timeline_id); 142 host_->host_impl()->animation_host()->GetTimelineById(timeline_id);
142 } 143 }
143 144
144 LayerTestCommon::LayerImplTest::~LayerImplTest() { 145 LayerTestCommon::LayerImplTest::~LayerImplTest() {
145 host_->animation_host()->RemoveAnimationTimeline(timeline_); 146 host_->animation_host()->RemoveAnimationTimeline(timeline_);
146 timeline_ = nullptr; 147 timeline_ = nullptr;
148 host_->host_impl()->ReleaseOutputSurface();
147 } 149 }
148 150
149 void LayerTestCommon::LayerImplTest::CalcDrawProps( 151 void LayerTestCommon::LayerImplTest::CalcDrawProps(
150 const gfx::Size& viewport_size) { 152 const gfx::Size& viewport_size) {
151 LayerImplList layer_list; 153 LayerImplList layer_list;
152 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( 154 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
153 root_layer(), viewport_size, &layer_list); 155 root_layer(), viewport_size, &layer_list);
154 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); 156 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
155 } 157 }
156 158
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 } 207 }
206 208
207 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} 209 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {}
208 210
209 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { 211 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() {
210 root_layer()->test_properties()->copy_requests.push_back( 212 root_layer()->test_properties()->copy_requests.push_back(
211 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); 213 CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
212 } 214 }
213 215
214 } // namespace cc 216 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698