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

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors 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
« no previous file with comments | « content/common/gpu/gpu_channel_manager.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index e66d71335e06be7031c87d53471530707ad8f714..ca546056da162be00e4bf46c72e6911cd9d22a3e 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -192,7 +192,7 @@ GpuCommandBufferStub::GpuCommandBufferStub(
mailbox_manager,
new GpuCommandBufferMemoryTracker(channel),
channel_->gpu_channel_manager()->shader_translator_cache(),
- NULL,
+ nullptr,
attrib_parser.bind_generates_resource);
}
@@ -415,7 +415,7 @@ void GpuCommandBufferStub::Destroy() {
OnRetireSyncPoint(sync_points_.front());
if (decoder_)
- decoder_->set_engine(NULL);
+ decoder_->set_engine(nullptr);
// The scheduler has raw references to the decoder and the command buffer so
// destroy it before those.
@@ -437,7 +437,7 @@ void GpuCommandBufferStub::Destroy() {
command_buffer_.reset();
// Remove this after crbug.com/248395 is sorted out.
- surface_ = NULL;
+ surface_ = nullptr;
}
void GpuCommandBufferStub::OnInitializeFailed(IPC::Message* reply_message) {
@@ -520,7 +520,7 @@ void GpuCommandBufferStub::OnInitialize(
// offscreen surface might not be compatible with this surface.
// Need to adjust at least GLX to be able to create the initial context
// with a config that is compatible with onscreen and offscreen surfaces.
- context = NULL;
+ context = nullptr;
DLOG(ERROR) << "Failed to initialize virtual GL context.";
OnInitializeFailed(reply_message);
« no previous file with comments | « content/common/gpu/gpu_channel_manager.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698