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

Unified Diff: cc/output/filter_operations.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/output/filter_operations.cc
diff --git a/cc/output/filter_operations.cc b/cc/output/filter_operations.cc
index dcdd4803fd60756b00ed365c8926573b4431eecf..fc3317d21d0e7a0d6ca690e21d315fbc413f2f0a 100644
--- a/cc/output/filter_operations.cc
+++ b/cc/output/filter_operations.cc
@@ -187,11 +187,11 @@ FilterOperations FilterOperations::Blend(const FilterOperations& from,
if (from_is_longer) {
for (size_t i = shorter_size; i < longer_size; i++) {
blended_filters.Append(
- FilterOperation::Blend(&from.at(i), NULL, progress));
+ FilterOperation::Blend(&from.at(i), nullptr, progress));
}
} else {
for (size_t i = shorter_size; i < longer_size; i++)
- blended_filters.Append(FilterOperation::Blend(NULL, &at(i), progress));
+ blended_filters.Append(FilterOperation::Blend(nullptr, &at(i), progress));
}
return blended_filters;

Powered by Google App Engine
This is Rietveld 408576698