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

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

Issue 16355009: Rewrite scoped_ptr<T>(NULL) to use the default ctor in cc/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix most vexing parse Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « cc/trees/single_thread_proxy.cc ('k') | no next file » | 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 #include <vector> 8 #include <vector>
9 9
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 476 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
477 layer_impl_tree_root.Pass(), 477 layer_impl_tree_root.Pass(),
478 host_impl_.active_tree()); 478 host_impl_.active_tree());
479 ExpectTreesAreIdentical(layer_tree_root.get(), 479 ExpectTreesAreIdentical(layer_tree_root.get(),
480 layer_impl_tree_root.get(), 480 layer_impl_tree_root.get(),
481 host_impl_.active_tree()); 481 host_impl_.active_tree());
482 } 482 }
483 483
484 TEST_F(TreeSynchronizerTest, SynchronizeAnimations) { 484 TEST_F(TreeSynchronizerTest, SynchronizeAnimations) {
485 LayerTreeSettings settings; 485 LayerTreeSettings settings;
486 FakeProxy proxy(scoped_ptr<Thread>(NULL)); 486 FakeProxy proxy((scoped_ptr<Thread>()));
487 DebugScopedSetImplThread impl(&proxy); 487 DebugScopedSetImplThread impl(&proxy);
488 FakeRenderingStatsInstrumentation stats_instrumentation; 488 FakeRenderingStatsInstrumentation stats_instrumentation;
489 scoped_ptr<LayerTreeHostImpl> host_impl = 489 scoped_ptr<LayerTreeHostImpl> host_impl =
490 LayerTreeHostImpl::Create(settings, 490 LayerTreeHostImpl::Create(settings,
491 NULL, 491 NULL,
492 &proxy, 492 &proxy,
493 &stats_instrumentation); 493 &stats_instrumentation);
494 494
495 scoped_refptr<Layer> layer_tree_root = Layer::Create(); 495 scoped_refptr<Layer> layer_tree_root = Layer::Create();
496 496
(...skipping 13 matching lines...) Expand all
510 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 510 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
511 layer_impl_tree_root.Pass(), 511 layer_impl_tree_root.Pass(),
512 host_impl_.active_tree()); 512 host_impl_.active_tree());
513 513
514 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>( 514 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(
515 layer_tree_root->layer_animation_controller())->SynchronizedAnimations()); 515 layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
516 } 516 }
517 517
518 } // namespace 518 } // namespace
519 } // namespace cc 519 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/single_thread_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698