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

Unified Diff: cc/resources/raster_worker_pool_perftest.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/resources/raster_worker_pool_perftest.cc
diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc
index e84e8af707f80ea8911051fc2b70d2ee5d8500e8..f6329f362d4b020b970dd16fd82adf0018a65d6f 100644
--- a/cc/resources/raster_worker_pool_perftest.cc
+++ b/cc/resources/raster_worker_pool_perftest.cc
@@ -77,7 +77,7 @@ class PerfContextProvider : public ContextProvider {
return context_gl_.get();
}
virtual gpu::ContextSupport* ContextSupport() override { return &support_; }
- virtual class GrContext* GrContext() override { return NULL; }
+ virtual class GrContext* GrContext() override { return nullptr; }
virtual bool IsContextLost() override { return false; }
virtual void VerifyContexts() override {}
virtual void DeleteCachedResources() override {}
@@ -401,7 +401,7 @@ class RasterWorkerPoolPerfTest
CHECK(output_surface_->BindToClient(&output_surface_client_));
resource_provider_ =
ResourceProvider::Create(
- output_surface_.get(), NULL, NULL, 0, false, 1, false).Pass();
+ output_surface_.get(), nullptr, nullptr, 0, false, 1, false).Pass();
}
void CreateSoftwareOutputSurfaceAndResourceProvider() {
@@ -410,7 +410,7 @@ class RasterWorkerPoolPerfTest
CHECK(output_surface_->BindToClient(&output_surface_client_));
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
&shared_bitmap_manager_,
- NULL,
+ nullptr,
0,
false,
1,
@@ -483,7 +483,7 @@ class RasterWorkerPoolCommonPerfTest : public RasterWorkerPoolPerfTestBase,
CHECK(output_surface_->BindToClient(&output_surface_client_));
resource_provider_ =
ResourceProvider::Create(
- output_surface_.get(), NULL, NULL, 0, false, 1, false).Pass();
+ output_surface_.get(), nullptr, nullptr, 0, false, 1, false).Pass();
}
void RunBuildRasterTaskQueueTest(const std::string& test_name,

Powered by Google App Engine
This is Rietveld 408576698