Index: cc/layers/tiled_layer.cc |
diff --git a/cc/layers/tiled_layer.cc b/cc/layers/tiled_layer.cc |
index 854a74735515a0d1dce3ea36dee0966de27c1206..2878fc3f6cc9bc73f634605aa752eb418cf2550d 100644 |
--- a/cc/layers/tiled_layer.cc |
+++ b/cc/layers/tiled_layer.cc |
@@ -236,7 +236,7 @@ void TiledLayer::PushPropertiesTo(LayerImpl* layer) { |
PrioritizedResourceManager* TiledLayer::ResourceManager() { |
if (!layer_tree_host()) |
- return NULL; |
+ return nullptr; |
return layer_tree_host()->contents_texture_manager(); |
} |
@@ -244,7 +244,7 @@ const PrioritizedResource* TiledLayer::ResourceAtForTesting(int i, |
int j) const { |
UpdatableTile* tile = TileAt(i, j); |
if (!tile) |
- return NULL; |
+ return nullptr; |
return tile->managed_resource(); |
} |
@@ -712,7 +712,7 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue, |
&top, |
&right, |
&bottom); |
- UpdateTiles(left, top, right, bottom, queue, NULL, &updated); |
+ UpdateTiles(left, top, right, bottom, queue, nullptr, &updated); |
if (updated) |
return updated; |
// This was an attempt to paint the entire layer so if we fail it's okay, |
@@ -743,7 +743,7 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue, |
return updated; |
// Prepaint anything that was occluded but inside the layer's visible region. |
- if (!UpdateTiles(left, top, right, bottom, queue, NULL, &updated) || |
+ if (!UpdateTiles(left, top, right, bottom, queue, nullptr, &updated) || |
updated) |
return updated; |
@@ -773,7 +773,7 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue, |
while (bottom < prepaint_bottom) { |
++bottom; |
if (!UpdateTiles( |
- left, bottom, right, bottom, queue, NULL, &updated) || |
+ left, bottom, right, bottom, queue, nullptr, &updated) || |
updated) |
return updated; |
} |
@@ -782,7 +782,7 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue, |
while (top > prepaint_top) { |
--top; |
if (!UpdateTiles( |
- left, top, right, top, queue, NULL, &updated) || |
+ left, top, right, top, queue, nullptr, &updated) || |
updated) |
return updated; |
} |
@@ -791,7 +791,7 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue, |
while (left > prepaint_left) { |
--left; |
if (!UpdateTiles( |
- left, top, left, bottom, queue, NULL, &updated) || |
+ left, top, left, bottom, queue, nullptr, &updated) || |
updated) |
return updated; |
} |
@@ -800,7 +800,7 @@ bool TiledLayer::Update(ResourceUpdateQueue* queue, |
while (right < prepaint_right) { |
++right; |
if (!UpdateTiles( |
- right, top, right, bottom, queue, NULL, &updated) || |
+ right, top, right, bottom, queue, nullptr, &updated) || |
updated) |
return updated; |
} |