commit f81ce4a37467f47ae39873fc65eb8101af1b2631
author Yunchao He <yunchao.he@intel.com> Mon Apr 24 10:49:17 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Tue Apr 25 14:32:47 2017 +0000
tree cbc80e19732b7e460256aeecb6b07208088815e1
parent f58417747f869a1e6933f68618433d209fba1cc4

Refactoring: replace NULL by nullptr for pointers (3rd CL).

This CL mainly handles passing/returning NULL to/from a function.

BUG=angleproject:2001

Change-Id: I34802f792e710e3d7ff697cbe4701dc1bf5ab009
Reviewed-on: https://chromium-review.googlesource.com/485060
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 178eeef..affc008 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -441,7 +441,7 @@
 
     for (auto &zeroTexture : mZeroTextures)
     {
-        zeroTexture.second.set(NULL);
+        zeroTexture.second.set(nullptr);
     }
     mZeroTextures.clear();
 
@@ -1184,7 +1184,7 @@
     gl::Error error = queryObject->end();
 
     // Always unbind the query, even if there was an error. This may delete the query object.
-    mGLState.setActiveQuery(target, NULL);
+    mGLState.setActiveQuery(target, nullptr);
 
     return error;
 }
@@ -1258,7 +1258,7 @@
 
     if (fence == mFenceNVMap.end())
     {
-        return NULL;
+        return nullptr;
     }
     else
     {
@@ -1272,7 +1272,7 @@
 
     if (query == mQueryMap.end())
     {
-        return NULL;
+        return nullptr;
     }
     else
     {