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

Unified Diff: cc/layers/layer_unittest.cc

Issue 609663003: cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc-passas: PassAs-presubmit-warning Created 6 years, 3 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/layers/layer_perftest.cc ('k') | cc/layers/nine_patch_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 3950cf2946b28e5714a3f645269febfd3ba2f0c2..846951d896762dd318dd3e3a4fb9f50c62b67bb0 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -78,7 +78,7 @@ class LayerTest : public testing::Test {
grand_child3_ = NULL;
layer_tree_host_->SetRootLayer(NULL);
- layer_tree_host_.reset();
+ layer_tree_host_ = nullptr;
}
void VerifyTestTreeInitialState() const {
@@ -1144,10 +1144,7 @@ static bool AddTestAnimation(Layer* layer) {
0.7f,
scoped_ptr<TimingFunction>()));
scoped_ptr<Animation> animation =
- Animation::Create(curve.PassAs<AnimationCurve>(),
- 0,
- 0,
- Animation::Opacity);
+ Animation::Create(curve.Pass(), 0, 0, Animation::Opacity);
return layer->AddAnimation(animation.Pass());
}
« no previous file with comments | « cc/layers/layer_perftest.cc ('k') | cc/layers/nine_patch_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698