| 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,
|
|
|