Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3357)

Unified Diff: cc/resources/raster_tile_priority_queue.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/resources/raster_tile_priority_queue.cc
diff --git a/cc/resources/raster_tile_priority_queue.cc b/cc/resources/raster_tile_priority_queue.cc
index 64a4a913ebfa78cfd4444f2b9b62a52ccad50d96..1a27f5a54fd891584d7c869f744c16dac683e9ad 100644
--- a/cc/resources/raster_tile_priority_queue.cc
+++ b/cc/resources/raster_tile_priority_queue.cc
@@ -201,7 +201,7 @@ void RasterTilePriorityQueue::PairedPictureLayerQueue::Pop(
// Accept a shared tile if the next tree is the higher priority one
// corresponding the iterator (active or pending) which usually (but due
// to spiral iterators not always) returns the shared tile first.
- if (next_tree == HigherPriorityTree(tree_priority, NULL, NULL, tile))
+ if (next_tree == HigherPriorityTree(tree_priority, NULL, nullptr, tile))
break;
}
}
@@ -223,7 +223,7 @@ RasterTilePriorityQueue::PairedPictureLayerQueue::NextTileIteratorTree(
// Now both iterators have tiles, so we have to decide based on tree priority.
return HigherPriorityTree(
- tree_priority, &active_iterator, &pending_iterator, NULL);
+ tree_priority, &active_iterator, &pending_iterator, nullptr);
}
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698