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

Unified Diff: cc/trees/damage_tracker_unittest.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
« no previous file with comments | « no previous file | cc/trees/layer_sorter.cc » ('j') | cc/trees/layer_tree_host_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/damage_tracker_unittest.cc
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index b6a44094dc69c5ef0c0e4f1edff4f5fac7e68dc1..b8d45464598c58c02da0b8a9cce8603a66048852 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc
@@ -733,7 +733,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForAddingAndRemovingLayer) {
// Then, test removing child1.
root->RemoveChild(child1);
- child1 = NULL;
+ child1 = nullptr;
EmulateDrawingOneFrame(root.get());
root_damage_rect =
@@ -1388,7 +1388,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForEmptyLayerList) {
target_surface->OwningLayerId(),
false,
gfx::Rect(),
- NULL,
+ nullptr,
FilterOperations());
gfx::Rect damage_rect =
« no previous file with comments | « no previous file | cc/trees/layer_sorter.cc » ('j') | cc/trees/layer_tree_host_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698