<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205956] releases/WebKitGTK/webkit-2.14/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205956">205956</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-15 00:59:10 -0700 (Thu, 15 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205852">r205852</a> - [GTK] Crash of WebProcess on the last WebView disconnect (take two)
https://bugs.webkit.org/show_bug.cgi?id=161842
Reviewed by Michael Catanzaro.
The problem is that when PlatformDisplayX11 is destroyed, the sharing GL context is deleted and its destructor
makes a downcast of PlatformDisplay to get the native X11 display. We could simply keep a pointer to the native
X11 display in GLContextGLX, got at construction time from the PlatformDisplay, and ensure the sharing GL
context is deleted before the native X11 display is closed.
* platform/graphics/PlatformDisplay.h: Make m_sharingGLContext protected.
* platform/graphics/glx/GLContextGLX.cpp:
(WebCore::GLContextGLX::GLContextGLX): Initialize m_x11Display.
(WebCore::GLContextGLX::~GLContextGLX): Use m_x11Display and remove confusing comment about possible crash with
nviedia closed drivers.
(WebCore::GLContextGLX::defaultFrameBufferSize): Use m_x11Display.
(WebCore::GLContextGLX::makeContextCurrent): Ditto.
(WebCore::GLContextGLX::swapBuffers): Ditto.
(WebCore::GLContextGLX::swapInterval): Ditto.
(WebCore::GLContextGLX::cairoDevice): Ditto.
* platform/graphics/glx/GLContextGLX.h:
* platform/graphics/x11/PlatformDisplayX11.cpp:
(WebCore::PlatformDisplayX11::~PlatformDisplayX11): Delete the sharing GL context before closing the display.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsPlatformDisplayh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsglxGLContextGLXcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsglxGLContextGLXh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsx11PlatformDisplayX11cpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205955 => 205956)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-15 07:50:59 UTC (rev 205955)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-15 07:59:10 UTC (rev 205956)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-09-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Crash of WebProcess on the last WebView disconnect (take two)
+ https://bugs.webkit.org/show_bug.cgi?id=161842
+
+ Reviewed by Michael Catanzaro.
+
+ The problem is that when PlatformDisplayX11 is destroyed, the sharing GL context is deleted and its destructor
+ makes a downcast of PlatformDisplay to get the native X11 display. We could simply keep a pointer to the native
+ X11 display in GLContextGLX, got at construction time from the PlatformDisplay, and ensure the sharing GL
+ context is deleted before the native X11 display is closed.
+
+ * platform/graphics/PlatformDisplay.h: Make m_sharingGLContext protected.
+ * platform/graphics/glx/GLContextGLX.cpp:
+ (WebCore::GLContextGLX::GLContextGLX): Initialize m_x11Display.
+ (WebCore::GLContextGLX::~GLContextGLX): Use m_x11Display and remove confusing comment about possible crash with
+ nviedia closed drivers.
+ (WebCore::GLContextGLX::defaultFrameBufferSize): Use m_x11Display.
+ (WebCore::GLContextGLX::makeContextCurrent): Ditto.
+ (WebCore::GLContextGLX::swapBuffers): Ditto.
+ (WebCore::GLContextGLX::swapInterval): Ditto.
+ (WebCore::GLContextGLX::cairoDevice): Ditto.
+ * platform/graphics/glx/GLContextGLX.h:
+ * platform/graphics/x11/PlatformDisplayX11.cpp:
+ (WebCore::PlatformDisplayX11::~PlatformDisplayX11): Delete the sharing GL context before closing the display.
+
</ins><span class="cx"> 2016-09-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Crash of WebProcess on the last WebView disconnect
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsPlatformDisplayh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h (205955 => 205956)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h 2016-09-15 07:50:59 UTC (rev 205955)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/PlatformDisplay.h 2016-09-15 07:59:10 UTC (rev 205956)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx"> EGLDisplay m_eglDisplay;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ std::unique_ptr<GLContext> m_sharingGLContext;
+
</ins><span class="cx"> private:
</span><span class="cx"> static std::unique_ptr<PlatformDisplay> createPlatformDisplay();
</span><span class="cx">
</span><span class="lines">@@ -90,7 +92,6 @@
</span><span class="cx"> int m_eglMajorVersion { 0 };
</span><span class="cx"> int m_eglMinorVersion { 0 };
</span><span class="cx"> #endif
</span><del>- std::unique_ptr<GLContext> m_sharingGLContext;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsglxGLContextGLXcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp (205955 => 205956)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2016-09-15 07:50:59 UTC (rev 205955)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2016-09-15 07:59:10 UTC (rev 205956)
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx">
</span><span class="cx"> GLContextGLX::GLContextGLX(PlatformDisplay& display, XUniqueGLXContext&& context, XID window)
</span><span class="cx"> : GLContext(display)
</span><ins>+ , m_x11Display(downcast<PlatformDisplayX11>(m_display).native())
</ins><span class="cx"> , m_context(WTFMove(context))
</span><span class="cx"> , m_window(window)
</span><span class="cx"> {
</span><span class="lines">@@ -188,6 +189,7 @@
</span><span class="cx">
</span><span class="cx"> GLContextGLX::GLContextGLX(PlatformDisplay& display, XUniqueGLXContext&& context, XUniqueGLXPbuffer&& pbuffer)
</span><span class="cx"> : GLContext(display)
</span><ins>+ , m_x11Display(downcast<PlatformDisplayX11>(m_display).native())
</ins><span class="cx"> , m_context(WTFMove(context))
</span><span class="cx"> , m_pbuffer(WTFMove(pbuffer))
</span><span class="cx"> {
</span><span class="lines">@@ -196,6 +198,7 @@
</span><span class="cx">
</span><span class="cx"> GLContextGLX::GLContextGLX(PlatformDisplay& display, XUniqueGLXContext&& context, XUniquePixmap&& pixmap, XUniqueGLXPixmap&& glxPixmap)
</span><span class="cx"> : GLContext(display)
</span><ins>+ , m_x11Display(downcast<PlatformDisplayX11>(m_display).native())
</ins><span class="cx"> , m_context(WTFMove(context))
</span><span class="cx"> , m_pixmap(WTFMove(pixmap))
</span><span class="cx"> , m_glxPixmap(WTFMove(glxPixmap))
</span><span class="lines">@@ -219,10 +222,8 @@
</span><span class="cx"> m_cairoDevice = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // This may be necessary to prevent crashes with NVidia's closed source drivers. Originally
- // from Mozilla's 3D canvas implementation at: http://bitbucket.org/ilmari/canvas3d/
</del><span class="cx"> glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
</span><del>- glXMakeCurrent(downcast<PlatformDisplayX11>(m_display).native(), None, None);
</del><ins>+ glXMakeCurrent(m_x11Display, None, None);
</ins><span class="cx">
</span><span class="cx"> m_context = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -240,7 +241,7 @@
</span><span class="cx"> int x, y;
</span><span class="cx"> Window rootWindow;
</span><span class="cx"> unsigned int width, height, borderWidth, depth;
</span><del>- if (!XGetGeometry(downcast<PlatformDisplayX11>(m_display).native(), m_window, &rootWindow, &x, &y, &width, &height, &borderWidth, &depth))
</del><ins>+ if (!XGetGeometry(m_x11Display, m_window, &rootWindow, &x, &y, &width, &height, &borderWidth, &depth))
</ins><span class="cx"> return IntSize();
</span><span class="cx">
</span><span class="cx"> return IntSize(width, height);
</span><span class="lines">@@ -254,20 +255,19 @@
</span><span class="cx"> if (glXGetCurrentContext() == m_context.get())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- Display* display = downcast<PlatformDisplayX11>(m_display).native();
</del><span class="cx"> if (m_window)
</span><del>- return glXMakeCurrent(display, m_window, m_context.get());
</del><ins>+ return glXMakeCurrent(m_x11Display, m_window, m_context.get());
</ins><span class="cx">
</span><span class="cx"> if (m_pbuffer)
</span><del>- return glXMakeCurrent(display, m_pbuffer.get(), m_context.get());
</del><ins>+ return glXMakeCurrent(m_x11Display, m_pbuffer.get(), m_context.get());
</ins><span class="cx">
</span><del>- return ::glXMakeCurrent(display, m_glxPixmap.get(), m_context.get());
</del><ins>+ return ::glXMakeCurrent(m_x11Display, m_glxPixmap.get(), m_context.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GLContextGLX::swapBuffers()
</span><span class="cx"> {
</span><span class="cx"> if (m_window)
</span><del>- glXSwapBuffers(downcast<PlatformDisplayX11>(m_display).native(), m_window);
</del><ins>+ glXSwapBuffers(m_x11Display, m_window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GLContextGLX::waitNative()
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> void GLContextGLX::swapInterval(int interval)
</span><span class="cx"> {
</span><del>- if (!hasSGISwapControlExtension(downcast<PlatformDisplayX11>(m_display).native()))
</del><ins>+ if (!hasSGISwapControlExtension(m_x11Display))
</ins><span class="cx"> return;
</span><span class="cx"> glXSwapIntervalSGI(interval);
</span><span class="cx"> }
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> return m_cairoDevice;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS
</span><del>- m_cairoDevice = cairo_glx_device_create(downcast<PlatformDisplayX11>(m_display).native(), m_context.get());
</del><ins>+ m_cairoDevice = cairo_glx_device_create(m_x11Display, m_context.get());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return m_cairoDevice;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsglxGLContextGLXh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.h (205955 => 205956)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.h 2016-09-15 07:50:59 UTC (rev 205955)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.h 2016-09-15 07:59:10 UTC (rev 205956)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> typedef unsigned char GLubyte;
</span><span class="cx"> typedef unsigned long XID;
</span><span class="cx"> typedef void* ContextKeyType;
</span><ins>+typedef struct _XDisplay Display;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -64,6 +65,7 @@
</span><span class="cx"> static std::unique_ptr<GLContextGLX> createPbufferContext(PlatformDisplay&, GLXContext sharingContext = nullptr);
</span><span class="cx"> static std::unique_ptr<GLContextGLX> createPixmapContext(PlatformDisplay&, GLXContext sharingContext = nullptr);
</span><span class="cx">
</span><ins>+ Display* m_x11Display { nullptr };
</ins><span class="cx"> XUniqueGLXContext m_context;
</span><span class="cx"> XID m_window { 0 };
</span><span class="cx"> XUniqueGLXPbuffer m_pbuffer;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsx11PlatformDisplayX11cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (205955 => 205956)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-09-15 07:50:59 UTC (rev 205955)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-09-15 07:59:10 UTC (rev 205956)
</span><span class="lines">@@ -35,8 +35,14 @@
</span><span class="cx">
</span><span class="cx"> #if USE(EGL)
</span><span class="cx"> #include <EGL/egl.h>
</span><ins>+#include <EGL/eglplatform.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// FIXME: this needs to be here, after eglplatform.h, to avoid EGLNativeDisplayType to be defined as wl_display.
+// Since we support Wayland and X11 to be built at the same time, but eglplatform.h defines are decided at compile time
+// we need to ensure we only include eglplatform.h from X11 or Wayland specific files.
+#include "GLContext.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PlatformDisplayX11::PlatformDisplayX11()
</span><span class="lines">@@ -53,6 +59,8 @@
</span><span class="cx">
</span><span class="cx"> PlatformDisplayX11::~PlatformDisplayX11()
</span><span class="cx"> {
</span><ins>+ // Clear the sharing context before releasing the display.
+ m_sharingGLContext = nullptr;
</ins><span class="cx"> if (m_ownedDisplay)
</span><span class="cx"> XCloseDisplay(m_display);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>