5 files changed, 14 insertions, 14 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index d86e3786f1..155fb63901 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -137,16 +137,16 @@ void SkDebuggerGUI::run(const SkPicture* pict,
                         sk_tools::PictureRenderer* renderer,
                         int repeats) {
     SkASSERT(pict);
-    if (NULL == pict) {
+    if (nullptr == pict) {
         return;
     }
 
-    SkASSERT(renderer != NULL);
-    if (NULL == renderer) {
+    SkASSERT(renderer != nullptr);
+    if (nullptr == renderer) {
         return;
     }
 
-    renderer->init(pict, NULL, NULL, NULL, false, false);
+    renderer->init(pict, nullptr, nullptr, nullptr, false, false);
 
     renderer->setup();
     renderer->render();
@@ -181,7 +181,7 @@ void SkDebuggerGUI::actionProfile() {
 
     SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream,
                                         &SkImageDecoder::DecodeMemory)); // , fSkipCommands));
-    if (NULL == picture.get()) {
+    if (nullptr == picture.get()) {
         return;
     }
 }
@@ -729,7 +729,7 @@ void SkDebuggerGUI::loadPicture(const SkString& fileName) {
 
     SkPicture* picture = SkPicture::CreateFromStream(stream);
 
-    if (NULL == picture) {
+    if (nullptr == picture) {
         QMessageBox::critical(this, "Error loading file", "Couldn't read file, sorry.");
         return;
     }
@@ -755,7 +755,7 @@ void SkDebuggerGUI::loadPicture(const SkString& fileName) {
 
     this->setupListWidget();
     this->setupComboBox();
-    this->setupOverviewText(NULL, 0.0, 1);
+    this->setupOverviewText(nullptr, 0.0, 1);
     fInspectorWidget.setDisabled(false);
     fViewStateFrame.setDisabled(false);
     fSettingsWidget.setDisabled(false);
diff --git a/debugger/QT/SkDrawCommandGeometryWidget.cpp b/debugger/QT/SkDrawCommandGeometryWidget.cpp
index 9f19785667..08192acf9a 100644
--- a/debugger/QT/SkDrawCommandGeometryWidget.cpp
+++ b/debugger/QT/SkDrawCommandGeometryWidget.cpp
@@ -23,7 +23,7 @@ void SkDrawCommandGeometryWidget::resizeEvent(QResizeEvent* event) {
     QRect r = this->contentsRect();
     int dim = std::min(r.width(), r.height());
     if (dim == 0) {
-        fSurface.reset(NULL);
+        fSurface.reset(nullptr);
     } else {
         SkImageInfo info = SkImageInfo::MakeN32Premul(dim, dim);
         fSurface.reset(SkSurface::NewRaster(info));
diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp
index 92c7b421ab..55bf963b1a 100644
--- a/debugger/QT/SkGLWidget.cpp
+++ b/debugger/QT/SkGLWidget.cpp
@@ -38,8 +38,8 @@ void SkGLWidget::initializeGL() {
     if (fCurContext) {
         fCurContext->abandonContext();
     }
-    fGpuDevice.reset(NULL);
-    fCanvas.reset(NULL);
+    fGpuDevice.reset(nullptr);
+    fCanvas.reset(nullptr);
 
     fCurContext.reset(GrContext::Create(kOpenGL_GrBackend, (GrBackendContext) fCurIntf.get()));
 }
@@ -55,8 +55,8 @@ void SkGLWidget::createRenderTarget() {
     glClear(GL_STENCIL_BUFFER_BIT);
     fCurContext->resetContext();
 
-    fGpuDevice.reset(NULL);
-    fCanvas.reset(NULL);
+    fGpuDevice.reset(nullptr);
+    fCanvas.reset(nullptr);
 
     GrBackendRenderTargetDesc desc = this->getDesc(this->width(), this->height());
     desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
diff --git a/debugger/QT/SkListWidget.h b/debugger/QT/SkListWidget.h
index 4a799a01fe..4298074481 100644
--- a/debugger/QT/SkListWidget.h
+++ b/debugger/QT/SkListWidget.h
@@ -23,7 +23,7 @@ public:
         Constructs the list widget with the specified parent for layout purposes.
         @param parent  The parent container of this widget
      */
-    SkListWidget(QObject* parent = NULL) {}
+    SkListWidget(QObject* parent = nullptr) {}
 
     virtual ~SkListWidget() {}
 
diff --git a/debugger/QT/SkRasterWidget.cpp b/debugger/QT/SkRasterWidget.cpp
index 72a742f7aa..203d98ee4e 100644
--- a/debugger/QT/SkRasterWidget.cpp
+++ b/debugger/QT/SkRasterWidget.cpp
@@ -22,7 +22,7 @@ void SkRasterWidget::resizeEvent(QResizeEvent* event) {
 
     QRect r = this->contentsRect();
     if (r.width() == 0 || r.height() == 0) {
-        fSurface.reset(NULL);
+        fSurface.reset(nullptr);
     } else {
         SkImageInfo info = SkImageInfo::MakeN32Premul(r.width(), r.height());
         fSurface.reset(SkSurface::NewRaster(info));