| Index: cc/trees/layer_tree_host_common.h
|
| diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
|
| index d4c09c69790a7bc429894f07c26cf691207080ee..994c1b4cc95dfc3284d1fd143ed68fb94c44220b 100644
|
| --- a/cc/trees/layer_tree_host_common.h
|
| +++ b/cc/trees/layer_tree_host_common.h
|
| @@ -165,7 +165,7 @@ template <typename LayerType>
|
| LayerType* LayerTreeHostCommon::FindLayerInSubtree(LayerType* root_layer,
|
| int layer_id) {
|
| if (!root_layer)
|
| - return NULL;
|
| + return nullptr;
|
|
|
| if (root_layer->id() == layer_id)
|
| return root_layer;
|
| @@ -182,7 +182,7 @@ LayerType* LayerTreeHostCommon::FindLayerInSubtree(LayerType* root_layer,
|
| get_layer_as_raw_ptr(root_layer->children(), i), layer_id))
|
| return found;
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| template <typename LayerType>
|
| @@ -219,7 +219,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
|
| device_transform,
|
| 1.f,
|
| 1.f,
|
| - NULL,
|
| + nullptr,
|
| std::numeric_limits<int>::max() / 2,
|
| false,
|
| true,
|
| @@ -243,7 +243,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
|
| identity_transform_,
|
| 1.f,
|
| 1.f,
|
| - NULL,
|
| + nullptr,
|
| std::numeric_limits<int>::max() / 2,
|
| false,
|
| true,
|
|
|