Index: cc/output/output_surface.cc |
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc |
index f0cbf5da205503f7244be7dad95744850d4392f7..4ed90e411e96b6aac4e60385d68a759020052b71 100644 |
--- a/cc/output/output_surface.cc |
+++ b/cc/output/output_surface.cc |
@@ -36,7 +36,7 @@ namespace cc { |
OutputSurface::OutputSurface( |
const scoped_refptr<ContextProvider>& context_provider) |
- : client_(NULL), |
+ : client_(nullptr), |
context_provider_(context_provider), |
device_scale_factor_(-1), |
external_stencil_test_enabled_(false), |
@@ -44,7 +44,7 @@ OutputSurface::OutputSurface( |
} |
OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device) |
- : client_(NULL), |
+ : client_(nullptr), |
software_device_(software_device.Pass()), |
device_scale_factor_(-1), |
external_stencil_test_enabled_(false), |
@@ -54,7 +54,7 @@ OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device) |
OutputSurface::OutputSurface( |
const scoped_refptr<ContextProvider>& context_provider, |
scoped_ptr<SoftwareOutputDevice> software_device) |
- : client_(NULL), |
+ : client_(nullptr), |
context_provider_(context_provider), |
software_device_(software_device.Pass()), |
device_scale_factor_(-1), |
@@ -127,7 +127,7 @@ bool OutputSurface::BindToClient(OutputSurfaceClient* client) { |
} |
if (!success) |
- client_ = NULL; |
+ client_ = nullptr; |
return success; |
} |
@@ -184,7 +184,7 @@ void OutputSurface::ResetContext3d() { |
context_provider_->SetMemoryPolicyChangedCallback( |
ContextProvider::MemoryPolicyChangedCallback()); |
} |
- context_provider_ = NULL; |
+ context_provider_ = nullptr; |
} |
void OutputSurface::EnsureBackbuffer() { |