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

Unified Diff: cc/output/renderer_unittest.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. 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/output/renderer_unittest.cc
diff --git a/cc/output/renderer_unittest.cc b/cc/output/renderer_unittest.cc
index 99ff89d569388346406ee7bbc4276bbc6db9975c..4d81b2f73b21755e1edc8e5a555f5549be5de498 100644
--- a/cc/output/renderer_unittest.cc
+++ b/cc/output/renderer_unittest.cc
@@ -48,7 +48,7 @@ scoped_ptr<Renderer> CreateRenderer<GLRenderer>(
OutputSurface* output_surface,
ResourceProvider* resource_provider) {
return GLRenderer::Create(
- client, settings, output_surface, resource_provider, NULL, 0);
+ client, settings, output_surface, resource_provider, nullptr, 0);
}
template <typename T>
@@ -60,7 +60,7 @@ class RendererTest : public ::testing::Test {
output_surface_.reset(new OutputSurface(context_provider_));
output_surface_->BindToClient(&output_surface_client_);
resource_provider_ = ResourceProvider::Create(
- output_surface_.get(), NULL, NULL, 0, false, 1, false);
+ output_surface_.get(), nullptr, nullptr, 0, false, 1, false);
renderer_ = CreateRenderer<T>(&renderer_client_,
&tree_settings_,
output_surface_.get(),

Powered by Google App Engine
This is Rietveld 408576698