Index: cc/trees/layer_tree_host_common.cc |
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc |
index 3bd1e79d90c8b7b43feeb66a953aaaca71e5e6ba..e56eb3c0220db357fa1aa9b8c26fc26097f24a5b 100644 |
--- a/cc/trees/layer_tree_host_common.cc |
+++ b/cc/trees/layer_tree_host_common.cc |
@@ -954,7 +954,7 @@ static inline void CalculateContentsScale(Layer* layer, float contents_scale) { |
} |
Layer* replica_mask_layer = |
- layer->replica_layer() ? layer->replica_layer()->mask_layer() : NULL; |
+ layer->replica_layer() ? layer->replica_layer()->mask_layer() : nullptr; |
if (replica_mask_layer) { |
replica_mask_layer->CalculateContentsScale( |
contents_scale, |
@@ -1755,7 +1755,7 @@ static void CalculateDrawPropertiesInternal( |
} |
LayerType* replica_mask_layer = |
- layer->replica_layer() ? layer->replica_layer()->mask_layer() : NULL; |
+ layer->replica_layer() ? layer->replica_layer()->mask_layer() : nullptr; |
if (replica_mask_layer) { |
UpdateLayerScaleDrawProperties( |
replica_mask_layer, |
@@ -2361,7 +2361,7 @@ static void ProcessCalcDrawPropsInputs( |
scaled_device_transform.Scale(inputs.device_scale_factor, |
inputs.device_scale_factor); |
- globals->layer_sorter = NULL; |
+ globals->layer_sorter = nullptr; |
globals->max_texture_size = inputs.max_texture_size; |
globals->device_scale_factor = |
inputs.device_scale_factor * device_transform_scale; |
@@ -2381,7 +2381,7 @@ static void ProcessCalcDrawPropsInputs( |
data_for_recursion->maximum_animation_contents_scale = 0.f; |
data_for_recursion->ancestor_is_animating_scale = false; |
data_for_recursion->ancestor_clips_subtree = true; |
- data_for_recursion->nearest_occlusion_immune_ancestor_surface = NULL; |
+ data_for_recursion->nearest_occlusion_immune_ancestor_surface = nullptr; |
data_for_recursion->in_subtree_of_page_scale_application_layer = false; |
data_for_recursion->subtree_can_use_lcd_text = inputs.can_use_lcd_text; |
data_for_recursion->subtree_is_visible_from_ancestor = true; |