| 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);
|
| }
|
|
|
|
|