Title: [226115] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 226115
- Author
- [email protected]
- Date
- 2017-12-19 00:16:28 -0800 (Tue, 19 Dec 2017)
Log Message
Merge r225078 - [WPE] WPEWebProcess: Couldn't find current GLX or EGL context
https://bugs.webkit.org/show_bug.cgi?id=179883
Reviewed by Žan Doberšek.
I'm seeing that message quite often when running the unit tests. The problem seems to be that some tests run so
fast that the web process never renders the first frame, so the context is created but never made current. I've
checked with apitrace that there are calls to eglQueryContext with null display, causing a EGL_BAD_DISPLAY, but
I don't know where those calls are originated. Making the context current right after it's created fixes the
problem.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::createGLContext): Always call makeContextCurrent() right after the context is created.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (226114 => 226115)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-12-19 08:15:33 UTC (rev 226114)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-12-19 08:16:28 UTC (rev 226115)
@@ -1,3 +1,19 @@
+2017-11-21 Carlos Garcia Campos <[email protected]>
+
+ [WPE] WPEWebProcess: Couldn't find current GLX or EGL context
+ https://bugs.webkit.org/show_bug.cgi?id=179883
+
+ Reviewed by Žan Doberšek.
+
+ I'm seeing that message quite often when running the unit tests. The problem seems to be that some tests run so
+ fast that the web process never renders the first frame, so the context is created but never made current. I've
+ checked with apitrace that there are calls to eglQueryContext with null display, causing a EGL_BAD_DISPLAY, but
+ I don't know where those calls are originated. Making the context current right after it's created fixes the
+ problem.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::createGLContext): Always call makeContextCurrent() right after the context is created.
+
2017-12-08 Michael Catanzaro <[email protected]>
[GTK] WebInspectorProxyClient needs a virtual destructor
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (226114 => 226115)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2017-12-19 08:15:33 UTC (rev 226114)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2017-12-19 08:16:28 UTC (rev 226115)
@@ -93,10 +93,11 @@
if (!m_context)
return;
- if (m_doFrameSync == ShouldDoFrameSync::No) {
- if (m_context->makeContextCurrent())
- m_context->swapInterval(0);
- }
+ if (!m_context->makeContextCurrent())
+ return;
+
+ if (m_doFrameSync == ShouldDoFrameSync::No)
+ m_context->swapInterval(0);
}
void ThreadedCompositor::invalidate()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
