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

Unified Diff: cc/test/layer_tree_pixel_test.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating 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/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index ed14e33f0e031fe3649f8176083503a1ff46907f..1eb2caefb6f10b80aaf8762ba7b6612ad65b6c52 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -176,7 +176,7 @@ scoped_refptr<SolidColorLayer> LayerTreePixelTest::
scoped_refptr<TextureLayer> LayerTreePixelTest::CreateTextureLayer(
const gfx::Rect& rect, const SkBitmap& bitmap) {
- scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(NULL);
+ scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(nullptr);
layer->SetIsDrawable(true);
layer->SetBounds(rect.size());
layer->SetPosition(rect.origin());
@@ -198,7 +198,7 @@ void LayerTreePixelTest::RunPixelTest(
base::FilePath file_name) {
test_type_ = test_type;
content_root_ = content_root;
- readback_target_ = NULL;
+ readback_target_ = nullptr;
ref_file_ = file_name;
RunTest(true, false, impl_side_painting_);
}

Powered by Google App Engine
This is Rietveld 408576698