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

Unified Diff: cc/layers/tiled_layer_impl_unittest.cc

Issue 643583003: [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: foramted. 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/layers/tiled_layer_impl_unittest.cc
diff --git a/cc/layers/tiled_layer_impl_unittest.cc b/cc/layers/tiled_layer_impl_unittest.cc
index ffc89c8e8dddf351da4f9ef99637d9b2b92974e1..3d34b9f6737e90670c977af2bd793fff6dae0b56 100644
--- a/cc/layers/tiled_layer_impl_unittest.cc
+++ b/cc/layers/tiled_layer_impl_unittest.cc
@@ -94,9 +94,9 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
scoped_ptr<RenderPass> render_pass = RenderPass::Create();
AppendQuadsData data;
- EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
+ EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, nullptr));
layer->AppendQuads(render_pass.get(), Occlusion(), &data);
- layer->DidDraw(NULL);
+ layer->DidDraw(nullptr);
unsigned num_tiles = num_tiles_x * num_tiles_y;
EXPECT_EQ(render_pass->quad_list.size(), num_tiles);
}
@@ -109,7 +109,7 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
scoped_ptr<RenderPass> render_pass = RenderPass::Create();
- EXPECT_FALSE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
+ EXPECT_FALSE(layer->WillDraw(DRAW_MODE_HARDWARE, nullptr));
}
// Layer with non-intersecting visible layer rect produces no quads
@@ -123,9 +123,9 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
scoped_ptr<RenderPass> render_pass = RenderPass::Create();
AppendQuadsData data;
- EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
+ EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, nullptr));
layer->AppendQuads(render_pass.get(), Occlusion(), &data);
- layer->DidDraw(NULL);
+ layer->DidDraw(nullptr);
EXPECT_EQ(render_pass->quad_list.size(), 0u);
}

Powered by Google App Engine
This is Rietveld 408576698