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

Unified Diff: cc/trees/layer_tree_host_unittest_animation.cc

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format fix. Created 6 years, 2 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
Index: cc/trees/layer_tree_host_unittest_animation.cc
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index 3bd55e533d7c0ba81d5c85563aba890e0b493ed6..a23ea0a5d66208a41db19c9422b3a540de0ff2ff 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -370,7 +370,7 @@ class LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree
base::TimeTicks monotonic_time,
Animation::TargetProperty target_property) override {
// Replace animated commits with an empty tree.
- layer_tree_host()->SetRootLayer(make_scoped_refptr<Layer>(NULL));
+ layer_tree_host()->SetRootLayer(make_scoped_refptr<Layer>(nullptr));
}
virtual void DidCommit() override {
@@ -671,7 +671,7 @@ class LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity
EXPECT_EQ(1u, update_check_layer_->update_count());
// clear update_check_layer_ so LayerTreeHost dies.
- update_check_layer_ = NULL;
+ update_check_layer_ = nullptr;
}
private:

Powered by Google App Engine
This is Rietveld 408576698