| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index c9fab0fc06034c14f840772b76aadcf7972a9fad..fe95b64a18a2d10360b69b8c7568f62a07d9cb13 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -125,7 +125,7 @@ class RasterTaskImpl : public RasterTask {
|
| // introduce noise in the measurement (sometimes they get rasterized
|
| // before we draw and sometimes they aren't)
|
| RenderingStatsInstrumentation* stats =
|
| - tile_resolution_ == HIGH_RESOLUTION ? rendering_stats_ : NULL;
|
| + tile_resolution_ == HIGH_RESOLUTION ? rendering_stats_ : nullptr;
|
| DCHECK(picture_pile);
|
| picture_pile->RasterToBitmap(
|
| canvas.get(), content_rect_, contents_scale_, stats);
|
| @@ -790,7 +790,7 @@ void TileManager::OnRasterTaskCompleted(
|
| ManagedTileState& mts = tile->managed_state();
|
| DCHECK(mts.raster_task.get());
|
| orphan_raster_tasks_.push_back(mts.raster_task);
|
| - mts.raster_task = NULL;
|
| + mts.raster_task = nullptr;
|
|
|
| if (was_canceled) {
|
| ++update_visible_tiles_stats_.canceled_count;
|
|
|