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-…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« cc/trees/layer_tree_host_unittest.cc ('K') | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | cc/trees/layer_tree_host_unittest_context.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 593c5c7da8f55a06535968aee79ff8768e403b83..b6a3c9667b0365facd0a21d9c47159c6cbdb3df2 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 {

@@ -669,7 +669,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: