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

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

Issue 12519006: cc:: Add RenderingStatsInstrumentation to manage collection of RenderingStats (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Updated all tests Created 7 years, 9 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
« no previous file with comments | « cc/trees/thread_proxy.cc ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/tree_synchronizer.h" 5 #include "cc/trees/tree_synchronizer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/animation/layer_animation_controller.h" 9 #include "cc/animation/layer_animation_controller.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 host_impl_.active_tree()); 477 host_impl_.active_tree());
478 ExpectTreesAreIdentical(layer_tree_root.get(), 478 ExpectTreesAreIdentical(layer_tree_root.get(),
479 layer_impl_tree_root.get(), 479 layer_impl_tree_root.get(),
480 host_impl_.active_tree()); 480 host_impl_.active_tree());
481 } 481 }
482 482
483 TEST_F(TreeSynchronizerTest, SynchronizeAnimations) { 483 TEST_F(TreeSynchronizerTest, SynchronizeAnimations) {
484 LayerTreeSettings settings; 484 LayerTreeSettings settings;
485 FakeProxy proxy(scoped_ptr<Thread>(NULL)); 485 FakeProxy proxy(scoped_ptr<Thread>(NULL));
486 DebugScopedSetImplThread impl(&proxy); 486 DebugScopedSetImplThread impl(&proxy);
487 FakeRenderingStatsInstrumentation stats_instrumentation;
487 scoped_ptr<LayerTreeHostImpl> host_impl = 488 scoped_ptr<LayerTreeHostImpl> host_impl =
488 LayerTreeHostImpl::Create(settings, NULL, &proxy); 489 LayerTreeHostImpl::Create(settings,
490 NULL,
491 &proxy,
492 &stats_instrumentation);
489 493
490 scoped_refptr<Layer> layer_tree_root = Layer::Create(); 494 scoped_refptr<Layer> layer_tree_root = Layer::Create();
491 495
492 layer_tree_root->SetLayerAnimationController( 496 layer_tree_root->SetLayerAnimationController(
493 FakeLayerAnimationController::Create()); 497 FakeLayerAnimationController::Create());
494 498
495 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>( 499 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(
496 layer_tree_root->layer_animation_controller())->SynchronizedAnimations()); 500 layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
497 501
498 scoped_ptr<LayerImpl> layer_impl_tree_root = 502 scoped_ptr<LayerImpl> layer_impl_tree_root =
499 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 503 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
500 scoped_ptr<LayerImpl>(), 504 scoped_ptr<LayerImpl>(),
501 host_impl_.active_tree()); 505 host_impl_.active_tree());
502 TreeSynchronizer::PushProperties(layer_tree_root.get(), 506 TreeSynchronizer::PushProperties(layer_tree_root.get(),
503 layer_impl_tree_root.get()); 507 layer_impl_tree_root.get());
504 layer_impl_tree_root = 508 layer_impl_tree_root =
505 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 509 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
506 layer_impl_tree_root.Pass(), 510 layer_impl_tree_root.Pass(),
507 host_impl_.active_tree()); 511 host_impl_.active_tree());
508 512
509 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>( 513 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(
510 layer_tree_root->layer_animation_controller())->SynchronizedAnimations()); 514 layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
511 } 515 }
512 516
513 } // namespace 517 } // namespace
514 } // namespace cc 518 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/thread_proxy.cc ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698