Enable GLContextHelper and register a SurfaceFactoryQt on eAndroid

This is needed to run on certain hardware that needs the shared EGL
contexts to be created on the same thread.
To prevent a deadlock on eAndroid only use a blocking connection
if we are not on the main thread where the singleton was created,
since there is a call to this from gpu_info_collector_android
before the GPU thread is launched.

Change-Id: I6887ad1218b8426097f454741dc5a79ee94f9d62
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index d2550e48d..feec45e90 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -75,6 +75,7 @@
 #include "gl_context_qt.h"
 #include "media_capture_devices_dispatcher.h"
 #include "type_conversion.h"
+#include "surface_factory_qt.h"
 #include "web_engine_library_info.h"
 #include <QGuiApplication>
 #include <QStringList>
@@ -94,6 +95,7 @@ void destroyContext()
 
 WebEngineContext::~WebEngineContext()
 {
+    GLContextHelper::destroy();
     m_runLoop->AfterRun();
 }
 
@@ -159,6 +161,11 @@ WebEngineContext::WebEngineContext()
     parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing);
 
     parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
+
+    // On eAndroid we use this to get the native display
+    // from Qt in GLSurfaceEGL::InitializeOneOff.
+    m_surfaceFactory.reset(new SurfaceFactoryQt());
+    gfx::SurfaceFactoryOzone::SetInstance(m_surfaceFactory.get());
 #endif
 
     GLContextHelper::initialize();