Index: cc/resources/picture_layer_tiling.h |
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h |
index 3858f1d7b31b75049ca3b6653ebd987ec7460326..bdbf1b8ae5c5732b72af5c3114ef25fb20f34ba7 100644 |
--- a/cc/resources/picture_layer_tiling.h |
+++ b/cc/resources/picture_layer_tiling.h |
@@ -159,7 +159,7 @@ class CC_EXPORT PictureLayerTiling { |
Tile* TileAt(int i, int j) const { |
TileMap::const_iterator iter = tiles_.find(TileMapKey(i, j)); |
- return (iter == tiles_.end()) ? NULL : iter->second.get(); |
+ return (iter == tiles_.end()) ? nullptr : iter->second.get(); |
} |
void CreateAllTilesForTesting() { |
@@ -333,7 +333,7 @@ class CC_EXPORT PictureLayerTiling { |
// Internal data. |
TilingData tiling_data_; |
- TileMap tiles_; // It is not legal to have a NULL tile in the tiles_ map. |
+ TileMap tiles_; // It is not legal to have a nullptr tile in the tiles_ map. |
danakj
2014/10/10 17:28:45
just use null in comments like this
|
gfx::Rect live_tiles_rect_; |
// State saved for computing velocities based upon finite differences. |