corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 784739 - Switch from NULL to nullptr in widget/android/; r=ehsan

Browse Source
This commit is contained in:
Birunthan Mohanathas
2013-10-10 16:42:52 -04:00
parent 9c97f8fe32
commit c4438f4272
9 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
widget/android/AndroidGraphicBuffer.cpp
View File

@@ -265,18 +265,18 @@ AndroidGraphicBuffer::DestroyBuffer()
if (mEGLImage) {
if (sGLFunctions.EnsureInitialized()) {
sGLFunctions.fDestroyImageKHR(sGLFunctions.fGetDisplay(EGL_DEFAULT_DISPLAY), mEGLImage);
mEGLImage = NULL;
mEGLImage = nullptr;
}
}
#endif
mEGLImage = NULL;
mEGLImage = nullptr;
if (mHandle) {
if (sGLFunctions.EnsureInitialized()) {
sGLFunctions.fGraphicBufferDtor(mHandle);
}
free(mHandle);
mHandle = NULL;
mHandle = nullptr;
}
}
@@ -413,7 +413,7 @@ AndroidGraphicBuffer::EnsureEGLImage()
void* nativeBuffer = sGLFunctions.fGraphicBufferGetNativeBuffer(mHandle);
mEGLImage = sGLFunctions.fCreateImageKHR(sGLFunctions.fGetDisplay(EGL_DEFAULT_DISPLAY), EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID, (EGLClientBuffer)nativeBuffer, eglImgAttrs);
return mEGLImage != NULL;
return mEGLImage != nullptr;
}
bool
@@ -445,7 +445,7 @@ static const char* const sAllowedBoards[] = {
"sgh-i997", // Samsung Infuse 4G
"herring", // Samsung Nexus S
"sgh-t839", // Samsung Sidekick 4G
NULL
nullptr
};
bool