diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-07-07 17:19:49 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-08-06 19:25:30 +0200 |
commit | adcb7979a5f7193d1b8c6b87c0f2c92cfa80a316 (patch) | |
tree | a5e6aa33178b20b72d3487a8add6dc3aca0b9f9a /src/core/chromium_overrides.cpp | |
parent | 3b1caeb21a66ca939854b897824e9e853ba60b67 (diff) |
Remove duplicate code for egl extensions and native display querying
This is now possible through GLSurfaceQt, and GLContextHelper respectively.
Change-Id: I06e13ccdea9737dc41b034befb4f01aa08d72c2a
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
-rw-r--r-- | src/core/chromium_overrides.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 2b1b1632e..a1758768d 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -41,10 +41,10 @@ #include "chromium_overrides.h" +#include "gl_context_qt.h" #include "qtwebenginecoreglobal.h" #include "base/values.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" - #include "content/browser/renderer_host/pepper/pepper_truetype_font_list.h" #include "content/common/font_list.h" @@ -59,7 +59,6 @@ #if defined(USE_X11) #include "base/message_loop/message_pump_x11.h" -#include <X11/Xlib.h> #endif #if defined(USE_AURA) && !defined(USE_OZONE) @@ -90,14 +89,8 @@ namespace base { #if defined(USE_X11) Display* MessagePumpForUI::GetDefaultXDisplay() { - static void *display = qApp->platformNativeInterface()->nativeResourceForScreen(QByteArrayLiteral("display"), qApp->primaryScreen()); - if (!display) { - // XLib isn't available or has not been initialized, which is a decision we wish to - // support, for example for the GPU process. - static Display* xdisplay = XOpenDisplay(NULL); - return xdisplay; - } - return static_cast<Display*>(display); + static void *display = GLContextHelper::getXDisplay(); + return static_cast<Display*>(display); } #endif |