cc/trees/layer_tree_host_unittest_picture.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_picture.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_no_message_loop.cc ('K') | « cc/trees/layer_tree_host_unittest_occlusion.cc ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_host_unittest_picture.cc

diff --git a/cc/trees/layer_tree_host_unittest_picture.cc b/cc/trees/layer_tree_host_unittest_picture.cc

index a79d0750f3dfa81ba1185b1a9868e52d47a8e590..db783275e74f8ab50782eca7fd512c0f6787c0de 100644

--- a/cc/trees/layer_tree_host_unittest_picture.cc

+++ b/cc/trees/layer_tree_host_unittest_picture.cc

@@ -66,13 +66,13 @@ class LayerTreeHostPictureTestTwinLayer

if (!active_root_impl) {

EXPECT_EQ(0, activates_);

- EXPECT_EQ(NULL, pending_picture_impl->twin_layer());

+ EXPECT_EQ(nullptr, pending_picture_impl->twin_layer());

return;

}

if (active_root_impl->children().empty()) {

EXPECT_EQ(3, activates_);

- EXPECT_EQ(NULL, pending_picture_impl->twin_layer());

+ EXPECT_EQ(nullptr, pending_picture_impl->twin_layer());

return;

}

@@ -97,7 +97,7 @@ class LayerTreeHostPictureTestTwinLayer

FakePictureLayerImpl* active_picture_impl =

static_cast<FakePictureLayerImpl*>(active_root_impl->children()[0]);

- EXPECT_EQ(NULL, active_picture_impl->twin_layer());

+ EXPECT_EQ(nullptr, active_picture_impl->twin_layer());

}

++activates_;