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

Unified Diff: cc/animation/transform_operations.cc

Issue 632613002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/base/latency_info_swap_promise_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/transform_operations.cc
diff --git a/cc/animation/transform_operations.cc b/cc/animation/transform_operations.cc
index 34c526b9a40535d3decc0e33ec849105219b7e74..6d8ad0f4414163d62dd6cb1e33b2b75090977a51 100644
--- a/cc/animation/transform_operations.cc
+++ b/cc/animation/transform_operations.cc
@@ -68,8 +68,8 @@ bool TransformOperations::BlendedBoundsForBox(const gfx::BoxF& box,
for (int i = num_operations - 1; i >= 0; --i) {
gfx::BoxF bounds_for_operation;
const TransformOperation* from_op =
- from_identity ? NULL : &from.operations_[i];
- const TransformOperation* to_op = to_identity ? NULL : &operations_[i];
+ from_identity ? nullptr : &from.operations_[i];
+ const TransformOperation* to_op = to_identity ? nullptr : &operations_[i];
if (!TransformOperation::BlendedBoundsForBox(*bounds,
from_op,
to_op,
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/base/latency_info_swap_promise_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698