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

Side by Side Diff: cc/trees/layer_tree_host_unittest_delegated.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 : public LayerTreeHostDelegatedTest, 267 : public LayerTreeHostDelegatedTest,
268 public DelegatedFrameResourceCollectionClient { 268 public DelegatedFrameResourceCollectionClient {
269 public: 269 public:
270 LayerTreeHostDelegatedTestCaseSingleDelegatedLayer() 270 LayerTreeHostDelegatedTestCaseSingleDelegatedLayer()
271 : resource_collection_(new DelegatedFrameResourceCollection), 271 : resource_collection_(new DelegatedFrameResourceCollection),
272 available_(false) { 272 available_(false) {
273 resource_collection_->SetClient(this); 273 resource_collection_->SetClient(this);
274 } 274 }
275 275
276 void SetupTree() override { 276 void SetupTree() override {
277 root_ = Layer::Create(); 277 root_ = Layer::Create(layer_settings());
278 root_->SetBounds(gfx::Size(15, 15)); 278 root_->SetBounds(gfx::Size(15, 15));
279 279
280 layer_tree_host()->SetRootLayer(root_); 280 layer_tree_host()->SetRootLayer(root_);
281 LayerTreeHostDelegatedTest::SetupTree(); 281 LayerTreeHostDelegatedTest::SetupTree();
282 } 282 }
283 283
284 void BeginTest() override { 284 void BeginTest() override {
285 resource_collection_->SetClient(this); 285 resource_collection_->SetClient(this);
286 PostSetNeedsCommitToMainThread(); 286 PostSetNeedsCommitToMainThread();
287 } 287 }
(...skipping 15 matching lines...) Expand all
303 303
304 frame_provider_ = new DelegatedFrameProvider(resource_collection_.get(), 304 frame_provider_ = new DelegatedFrameProvider(resource_collection_.get(),
305 frame_data.Pass()); 305 frame_data.Pass());
306 306
307 delegated_ = CreateDelegatedLayer(frame_provider_.get()); 307 delegated_ = CreateDelegatedLayer(frame_provider_.get());
308 } 308 }
309 309
310 scoped_refptr<DelegatedRendererLayer> CreateDelegatedLayer( 310 scoped_refptr<DelegatedRendererLayer> CreateDelegatedLayer(
311 DelegatedFrameProvider* frame_provider) { 311 DelegatedFrameProvider* frame_provider) {
312 scoped_refptr<DelegatedRendererLayer> delegated = 312 scoped_refptr<DelegatedRendererLayer> delegated =
313 FakeDelegatedRendererLayer::Create(frame_provider); 313 FakeDelegatedRendererLayer::Create(layer_settings(), frame_provider);
314 delegated->SetBounds(gfx::Size(10, 10)); 314 delegated->SetBounds(gfx::Size(10, 10));
315 delegated->SetIsDrawable(true); 315 delegated->SetIsDrawable(true);
316 316
317 root_->AddChild(delegated); 317 root_->AddChild(delegated);
318 return delegated; 318 return delegated;
319 } 319 }
320 320
321 void AfterTest() override { resource_collection_->SetClient(NULL); } 321 void AfterTest() override { resource_collection_->SetClient(NULL); }
322 322
323 // DelegatedFrameProviderClient implementation. 323 // DelegatedFrameProviderClient implementation.
(...skipping 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after
2254 ReturnAllResourcesFromParent(host_impl); 2254 ReturnAllResourcesFromParent(host_impl);
2255 } 2255 }
2256 2256
2257 bool drew_with_pending_tree_; 2257 bool drew_with_pending_tree_;
2258 }; 2258 };
2259 2259
2260 MULTI_THREAD_IMPL_TEST_F(LayerTreeHostDelegatedTestActiveFrameIsValid); 2260 MULTI_THREAD_IMPL_TEST_F(LayerTreeHostDelegatedTestActiveFrameIsValid);
2261 2261
2262 } // namespace 2262 } // namespace
2263 } // namespace cc 2263 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698