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

Unified Diff: cc/trees/layer_tree_host_common.h

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format fix. 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/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,

Powered by Google App Engine
This is Rietveld 408576698