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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | chrome/browser/autocomplete/extension_app_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index febf23f3e9891729d9b96150e7e282a4ac848b32..cd7868e5cd6081b0f9f35a08fd518f60b2e412dd 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -762,9 +762,9 @@ class LayerTreeHostScrollTestLayerStructureChange
scoped_refptr<Layer> root_layer = Layer::Create();
root_layer->SetBounds(gfx::Size(10, 10));
- Layer* root_scroll_layer = CreateScrollLayer(root_layer,
- &root_scroll_layer_client_);
- CreateScrollLayer(root_layer, &sibling_scroll_layer_client_);
+ Layer* root_scroll_layer =
+ CreateScrollLayer(root_layer.get(), &root_scroll_layer_client_);
+ CreateScrollLayer(root_layer.get(), &sibling_scroll_layer_client_);
CreateScrollLayer(root_scroll_layer, &child_scroll_layer_client_);
layer_tree_host()->SetRootLayer(root_layer);
@@ -822,7 +822,7 @@ class LayerTreeHostScrollTestLayerStructureChange
scroll_layer->SetMaxScrollOffset(gfx::Vector2d(100, 100));
scroll_layer->set_layer_scroll_client(client);
client->owner_ = this;
- client->layer_ = scroll_layer;
+ client->layer_ = scroll_layer.get();
parent->AddChild(scroll_layer);
return scroll_layer.get();
}
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | chrome/browser/autocomplete/extension_app_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698