Index: cc/resources/picture_layer_tiling_set.cc |
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc |
index 1806ebc01c06b61ecdd318e2b7b1bdf793558c3b..881192638acdeeb15b9126065f949f6e0fb8a6f6 100644 |
--- a/cc/resources/picture_layer_tiling_set.cc |
+++ b/cc/resources/picture_layer_tiling_set.cc |
@@ -130,7 +130,7 @@ PictureLayerTiling* PictureLayerTilingSet::TilingAtScale(float scale) const { |
if (tilings_[i]->contents_scale() == scale) |
return tilings_[i]; |
} |
- return NULL; |
+ return nullptr; |
} |
void PictureLayerTilingSet::RemoveAllTilings() { |
@@ -208,13 +208,13 @@ gfx::Size PictureLayerTilingSet::CoverageIterator::texture_size() const { |
Tile* PictureLayerTilingSet::CoverageIterator::operator->() const { |
if (!tiling_iter_) |
- return NULL; |
+ return nullptr; |
return *tiling_iter_; |
} |
Tile* PictureLayerTilingSet::CoverageIterator::operator*() const { |
if (!tiling_iter_) |
- return NULL; |
+ return nullptr; |
return *tiling_iter_; |
} |
@@ -227,9 +227,9 @@ TileResolution PictureLayerTilingSet::CoverageIterator::resolution() const { |
PictureLayerTiling* PictureLayerTilingSet::CoverageIterator::CurrentTiling() |
const { |
if (current_tiling_ < 0) |
- return NULL; |
+ return nullptr; |
if (static_cast<size_t>(current_tiling_) >= set_->tilings_.size()) |
- return NULL; |
+ return nullptr; |
return set_->tilings_[current_tiling_]; |
} |