diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-08 09:35:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-08 09:35:18 -0800 |
| commit | e142e27456629a0cb2e47c6d47ba7b77875097f0 (patch) | |
| tree | cacf898c92498eeaa8c6c614e3742afac10cfe52 /WebCore | |
| parent | ccbb8a238ca0ba5fc0780884e281e6b6a601a675 (diff) | |
| parent | ba25389b2d1f3d6603ed1ea816278f91a4ca95c0 (diff) | |
| download | external_webkit-e142e27456629a0cb2e47c6d47ba7b77875097f0.zip external_webkit-e142e27456629a0cb2e47c6d47ba7b77875097f0.tar.gz external_webkit-e142e27456629a0cb2e47c6d47ba7b77875097f0.tar.bz2 | |
Merge "Null-check in GLUtils::isEGLImageSupported()"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/GLUtils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/GLUtils.cpp b/WebCore/platform/graphics/android/GLUtils.cpp index e9c0796..1c84fe2 100644 --- a/WebCore/platform/graphics/android/GLUtils.cpp +++ b/WebCore/platform/graphics/android/GLUtils.cpp @@ -121,14 +121,15 @@ bool GLUtils::isEGLImageSupported() { const char* eglExtensions = eglQueryString(eglGetCurrentDisplay(), EGL_EXTENSIONS); const char* glExtensions = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)); - return strstr(eglExtensions, "EGL_KHR_image_base") && + return eglExtensions && glExtensions && + strstr(eglExtensions, "EGL_KHR_image_base") && strstr(eglExtensions, "EGL_KHR_gl_texture_2D_image") && strstr(glExtensions, "GL_OES_EGL_image"); } bool GLUtils::isEGLFenceSyncSupported() { const char* eglExtensions = eglQueryString(eglGetCurrentDisplay(), EGL_EXTENSIONS); - return strstr(eglExtensions, "EGL_KHR_fence_sync"); + return eglExtensions && strstr(eglExtensions, "EGL_KHR_fence_sync"); } ///////////////////////////////////////////////////////////////////////////////////////// |