diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-23 10:59:49 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-24 08:27:49 +0000 |
| commit | 0b5f2ac369edc1cbec69eaefacbf19df496bfeb2 (patch) | |
| tree | 1d8dd1c5edfce4ef1fffe74d154d266170287ca1 | |
| parent | 57c37d6c529824e3fb52a74f3e439fb7ad7ecb40 (diff) | |
| download | qtwebengine-chromium-0b5f2ac369edc1cbec69eaefacbf19df496bfeb2.tar.gz | |
<chromium> Move querying EGL extensions out of chromium
We need to query the EGL extension in qtwebenginecore to avoid directly
accessing EGL methods that may not be linked directly.
Change-Id: Iddd1df70d2dd37964bb0cba70c2a3aa4c67d8002
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| -rw-r--r-- | chromium/ui/gl/gl_bindings.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/ui/gl/gl_bindings.cc b/chromium/ui/gl/gl_bindings.cc index c576db8e14d..acd6ffa4016 100644 --- a/chromium/ui/gl/gl_bindings.cc +++ b/chromium/ui/gl/gl_bindings.cc @@ -40,6 +40,7 @@ std::string DriverWGL::GetPlatformExtensions() { #endif #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE) +#if !defined(TOOLKIT_QT) std::string DriverEGL::GetPlatformExtensions() { EGLDisplay display = GLSurfaceEGL::InitializeDisplay(); if (display == EGL_NO_DISPLAY) @@ -49,7 +50,7 @@ std::string DriverEGL::GetPlatformExtensions() { const char* str = g_driver_egl.fn.eglQueryStringFn(display, EGL_EXTENSIONS); return str ? std::string(str) : ""; } - +#endif // static std::string DriverEGL::GetClientExtensions() { DCHECK(g_driver_egl.fn.eglQueryStringFn); |