fix frequent deadlocks on Windows

With a desktop OpenGL build of Qt we encountered frequent deadlocks
when creating OpenGL contexts.
Initialize the context directly on the calling thread instead
of the browser thread and do not synchronize with the browser thread.

Task-number: QTBUG-48276
Change-Id: I0970c66cb230881cdc53f22d4a255ea08e6fe63a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
index b350c3c5b..3a6de6935 100644
--- a/src/core/gl_context_qt.cpp
+++ b/src/core/gl_context_qt.cpp
@@ -146,10 +146,16 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(GLShareGroup* share_group, G
 {
 #if defined(OS_WIN)
     scoped_refptr<GLContext> context;
-    if (GetGLImplementation() == kGLImplementationDesktopGL)
+    if (GetGLImplementation() == kGLImplementationDesktopGL) {
         context = new GLContextWGL(share_group);
-    else
+        if (!context->Initialize(compatible_surface, gpu_preference)) {
+            delete context;
+            return nullptr;
+        }
+        return context;
+    } else {
         context = new GLContextEGL(share_group);
+    }
 #else
     scoped_refptr<GLContext> context = new GLContextEGL(share_group);
 #endif