Index: src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp |
diff --git a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp |
index 3aab86d28d1aa5c692db8a033853d4ddb9ef222e..cba380b74da11c78e1036a2f375981e0b9cf3825 100644 |
--- a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp |
+++ b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp |
@@ -18,7 +18,7 @@ public: |
fModule = LoadLibrary(moduleName); |
} |
~AutoLibraryUnload() { |
- if (NULL != fModule) { |
+ if (fModule) { |
FreeLibrary(fModule); |
} |
} |
@@ -32,14 +32,14 @@ class GLProcGetter { |
public: |
GLProcGetter() : fGLLib("opengl32.dll") {} |
- bool isInitialized() const { return NULL != fGLLib.get(); } |
+ bool isInitialized() const { return SkToBool(fGLLib.get()); } |
GrGLFuncPtr getProc(const char name[]) const { |
GrGLFuncPtr proc; |
- if (NULL != (proc = (GrGLFuncPtr) GetProcAddress(fGLLib.get(), name))) { |
+ if ((proc = (GrGLFuncPtr) GetProcAddress(fGLLib.get(), name))) { |
return proc; |
} |
- if (NULL != (proc = (GrGLFuncPtr) wglGetProcAddress(name))) { |
+ if ((proc = (GrGLFuncPtr) wglGetProcAddress(name))) { |
return proc; |
} |
return NULL; |
@@ -50,8 +50,8 @@ private: |
}; |
static GrGLFuncPtr win_get_gl_proc(void* ctx, const char name[]) { |
- SkASSERT(NULL != ctx); |
- SkASSERT(NULL != wglGetCurrentContext()); |
+ SkASSERT(ctx); |
+ SkASSERT(wglGetCurrentContext()); |
const GLProcGetter* getter = (const GLProcGetter*) ctx; |
return getter->getProc(name); |
} |