Index: cc/resources/prioritized_resource_manager.cc |
diff --git a/cc/resources/prioritized_resource_manager.cc b/cc/resources/prioritized_resource_manager.cc |
index 54ed3089cee2709f954732bcbf523659aed40a6d..f328bae407954a5f4adfe22ecbbb3f87a990f5cc 100644 |
--- a/cc/resources/prioritized_resource_manager.cc |
+++ b/cc/resources/prioritized_resource_manager.cc |
@@ -236,7 +236,7 @@ void PrioritizedResourceManager::AcquireBackingTextureIfNeeded( |
return; |
// Find a backing below, by either recycling or allocating. |
- PrioritizedResource::Backing* backing = NULL; |
+ PrioritizedResource::Backing* backing = nullptr; |
// First try to recycle |
for (BackingList::iterator it = backings_.begin(); it != backings_.end(); |
@@ -431,7 +431,7 @@ void PrioritizedResourceManager::UnregisterTexture( |
DCHECK(ContainsKey(textures_, texture)); |
ReturnBackingTexture(texture); |
- texture->set_manager_internal(NULL); |
+ texture->set_manager_internal(nullptr); |
textures_.erase(texture); |
texture->set_above_priority_cutoff(false); |
} |
@@ -525,7 +525,7 @@ void PrioritizedResourceManager::AssertInvariants() { |
// backings that can't be evicted in the backing texture list (otherwise |
// ReduceMemory will not find all textures available for eviction/recycling). |
bool reached_unrecyclable = false; |
- PrioritizedResource::Backing* previous_backing = NULL; |
+ PrioritizedResource::Backing* previous_backing = nullptr; |
for (BackingList::iterator it = backings_.begin(); it != backings_.end(); |
++it) { |
PrioritizedResource::Backing* backing = *it; |