Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / GrGLCreateNullInterface.cpp

diff --git a/src/third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
index 8b6d9a6..9cac1c6 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -21,7 +21,7 @@ public:
     ~BufferObj() { SkDELETE_ARRAY(fDataPtr); }
 
     void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) {
-        if (NULL != fDataPtr) {
+        if (fDataPtr) {
             SkASSERT(0 != fSize);
             SkDELETE_ARRAY(fDataPtr);
         }
@@ -65,7 +65,7 @@ public:
 
     BufferObj* lookUp(GrGLuint id) {
         BufferObj* buffer = fBuffers[id];
-        SkASSERT(NULL != buffer && buffer->id() == id);
+        SkASSERT(buffer && buffer->id() == id);
         return buffer;
     }