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

Unified Diff: cc/resources/picture_layer_tiling_set_unittest.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. 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/resources/picture_layer_tiling_set_unittest.cc
diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc
index e566d11e2fac1bf470af1ca6279a1a1f7eb29c14..76affea411da82ccfecab35ed1d8b9fe1ebbaad9 100644
--- a/cc/resources/picture_layer_tiling_set_unittest.cc
+++ b/cc/resources/picture_layer_tiling_set_unittest.cc
@@ -205,7 +205,7 @@ class PictureLayerTilingSetTestWithResources : public testing::Test {
scoped_ptr<ResourceProvider> resource_provider =
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -430,7 +430,7 @@ Tile* FindTileAtOrigin(PictureLayerTiling* tiling) {
if (tiles[i]->content_rect().origin() == gfx::Point())
return tiles[i];
}
- return NULL;
+ return nullptr;
}
TEST_F(PictureLayerTilingSetSyncTest, KeepExisting) {

Powered by Google App Engine
This is Rietveld 408576698