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

Unified Diff: cc/trees/tree_synchronizer_unittest.cc

Issue 500123003: Remove implicit conversions from scoped_refptr to T* in cc/trees/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/tree_synchronizer_unittest.cc
diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc
index 46895541ab83f74a82a33f6b7785fa5d38920c46..6db91467aed71ae8943a143fe7a071222bac0378 100644
--- a/cc/trees/tree_synchronizer_unittest.cc
+++ b/cc/trees/tree_synchronizer_unittest.cc
@@ -616,8 +616,8 @@ TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
host_->SetRootLayer(layer_tree_root);
// First child is the second and third child's scroll parent.
- layer_tree_root->children()[1]->SetScrollParent(scroll_parent);
- layer_tree_root->children()[2]->SetScrollParent(scroll_parent);
+ layer_tree_root->children()[1]->SetScrollParent(scroll_parent.get());
+ layer_tree_root->children()[2]->SetScrollParent(scroll_parent.get());
scoped_ptr<LayerImpl> layer_impl_tree_root =
TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
@@ -650,7 +650,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
// Add an additional scroll layer.
scoped_refptr<Layer> additional_scroll_child = Layer::Create();
layer_tree_root->AddChild(additional_scroll_child);
- additional_scroll_child->SetScrollParent(scroll_parent);
+ additional_scroll_child->SetScrollParent(scroll_parent.get());
layer_impl_tree_root =
TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
layer_impl_tree_root.Pass(),
@@ -693,8 +693,8 @@ TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
host_->SetRootLayer(layer_tree_root);
// First child is the second and third child's scroll parent.
- clip_child1->SetClipParent(clip_parent);
- clip_child2->SetClipParent(clip_parent);
+ clip_child1->SetClipParent(clip_parent.get());
+ clip_child2->SetClipParent(clip_parent.get());
scoped_ptr<LayerImpl> layer_impl_tree_root =
TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
@@ -723,7 +723,7 @@ TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
// Add an additional clip child.
scoped_refptr<Layer> additional_clip_child = Layer::Create();
intervening->AddChild(additional_clip_child);
- additional_clip_child->SetClipParent(clip_parent);
+ additional_clip_child->SetClipParent(clip_parent.get());
layer_impl_tree_root =
TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
layer_impl_tree_root.Pass(),
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698