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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.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_host_unittest_no_message_loop.cc ('k') | cc/trees/layer_tree_impl.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 60ca59b834fdbc8ace6b44d075436e7bc4823807..05e210917f1530a7d5f65a75e81c2c4441a962cc 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -50,7 +50,7 @@ class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest {
virtual void Layout() OVERRIDE {
Layer* root = layer_tree_host()->root_layer();
- Layer* scroll_layer = root->children()[0];
+ Layer* scroll_layer = root->children()[0].get();
if (!layer_tree_host()->source_frame_number()) {
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
} else {
@@ -221,7 +221,8 @@ class LayerTreeHostScrollTestScrollAbortedCommit
virtual void WillBeginMainFrame() OVERRIDE {
num_will_begin_main_frames_++;
- Layer* root_scroll_layer = layer_tree_host()->root_layer()->children()[0];
+ Layer* root_scroll_layer =
+ layer_tree_host()->root_layer()->children()[0].get();
switch (num_will_begin_main_frames_) {
case 1:
// This will not be aborted because of the initial prop changes.
@@ -773,7 +774,7 @@ class ImplSidePaintingScrollTestSimple : public ImplSidePaintingScrollTest {
virtual void Layout() OVERRIDE {
Layer* root = layer_tree_host()->root_layer();
- Layer* scroll_layer = root->children()[0];
+ Layer* scroll_layer = root->children()[0].get();
if (!layer_tree_host()->source_frame_number()) {
EXPECT_VECTOR_EQ(scroll_layer->scroll_offset(), initial_scroll_);
} else {
@@ -901,7 +902,7 @@ class ImplSidePaintingScrollTestImplOnlyScroll
virtual void WillCommit() OVERRIDE {
Layer* root = layer_tree_host()->root_layer();
- Layer* scroll_layer = root->children()[0];
+ Layer* scroll_layer = root->children()[0].get();
switch (layer_tree_host()->source_frame_number()) {
case 0:
EXPECT_TRUE(scroll_layer->needs_push_properties());
« no previous file with comments | « cc/trees/layer_tree_host_unittest_no_message_loop.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698