<!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>[214688] trunk/Source</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/214688">214688</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-31 15:03:39 -0700 (Fri, 31 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] WebCore::PlatformDisplay::terminateEGLDisplay causes a crash in libGLESv2.dll while processing atexit
https://bugs.webkit.org/show_bug.cgi?id=170331
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2017-03-31
Reviewed by Michael Catanzaro.
Source/WebCore:
WebCore::PlatformDisplay uses atexit to destruct EGL displays
while exiting process. But, when the atexit will be processed,
heap of libGLESv2.dll would be already destructed and causing a
crash on Windows. Do not use atexit for Windows.
AppleWin port does not use PlatformDisplay. Thus, it does not have
this bug.
* platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::initializeEGLDisplay): Do not use atexit for Windows.
(WebCore::PlatformDisplay::shutDownEglDisplays): Added.
* platform/graphics/PlatformDisplay.h: Added a declaration of shutDownEglDisplays.
Source/WebKit/win:
* WebKitDLL.cpp:
(shutDownWebKit): Call PlatformDisplay::shutDownEglDisplays in shutDownWebKit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp">trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplayh">trunk/Source/WebCore/platform/graphics/PlatformDisplay.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitDLLcpp">trunk/Source/WebKit/win/WebKitDLL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214687 => 214688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-31 21:46:42 UTC (rev 214687)
+++ trunk/Source/WebCore/ChangeLog 2017-03-31 22:03:39 UTC (rev 214688)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-31 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [WinCairo] WebCore::PlatformDisplay::terminateEGLDisplay causes a crash in libGLESv2.dll while processing atexit
+ https://bugs.webkit.org/show_bug.cgi?id=170331
+
+ Reviewed by Michael Catanzaro.
+
+ WebCore::PlatformDisplay uses atexit to destruct EGL displays
+ while exiting process. But, when the atexit will be processed,
+ heap of libGLESv2.dll would be already destructed and causing a
+ crash on Windows. Do not use atexit for Windows.
+
+ AppleWin port does not use PlatformDisplay. Thus, it does not have
+ this bug.
+
+ * platform/graphics/PlatformDisplay.cpp:
+ (WebCore::PlatformDisplay::initializeEGLDisplay): Do not use atexit for Windows.
+ (WebCore::PlatformDisplay::shutDownEglDisplays): Added.
+ * platform/graphics/PlatformDisplay.h: Added a declaration of shutDownEglDisplays.
+
</ins><span class="cx"> 2017-03-31 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Remove PRELOAD_DEBUG related code.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (214687 => 214688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2017-03-31 21:46:42 UTC (rev 214687)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2017-03-31 22:03:39 UTC (rev 214688)
</span><span class="lines">@@ -207,6 +207,7 @@
</span><span class="cx">
</span><span class="cx"> eglDisplays().add(this);
</span><span class="cx">
</span><ins>+#if !PLATFORM(WIN)
</ins><span class="cx"> static bool eglAtexitHandlerInitialized = false;
</span><span class="cx"> if (!eglAtexitHandlerInitialized) {
</span><span class="cx"> // EGL registers atexit handlers to cleanup its global display list.
</span><span class="lines">@@ -218,13 +219,9 @@
</span><span class="cx"> // EGL atexit handlers and the PlatformDisplay destructor.
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=157973.
</span><span class="cx"> eglAtexitHandlerInitialized = true;
</span><del>- std::atexit([] {
- while (!eglDisplays().isEmpty()) {
- auto* display = eglDisplays().takeAny();
- display->terminateEGLDisplay();
- }
- });
</del><ins>+ std::atexit(shutDownEglDisplays);
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformDisplay::terminateEGLDisplay()
</span><span class="lines">@@ -236,6 +233,15 @@
</span><span class="cx"> eglTerminate(m_eglDisplay);
</span><span class="cx"> m_eglDisplay = EGL_NO_DISPLAY;
</span><span class="cx"> }
</span><ins>+
+void PlatformDisplay::shutDownEglDisplays()
+{
+ while (!eglDisplays().isEmpty()) {
+ auto* display = eglDisplays().takeAny();
+ display->terminateEGLDisplay();
+ }
+}
+
</ins><span class="cx"> #endif // USE(EGL)
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.h (214687 => 214688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2017-03-31 21:46:42 UTC (rev 214687)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2017-03-31 22:03:39 UTC (rev 214688)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> #if USE(EGL)
</span><span class="cx"> EGLDisplay eglDisplay() const;
</span><span class="cx"> bool eglCheckVersion(int major, int minor) const;
</span><ins>+ static void shutDownEglDisplays();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (214687 => 214688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2017-03-31 21:46:42 UTC (rev 214687)
+++ trunk/Source/WebKit/win/ChangeLog 2017-03-31 22:03:39 UTC (rev 214688)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-31 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [WinCairo] WebCore::PlatformDisplay::terminateEGLDisplay causes a crash in libGLESv2.dll while processing atexit
+ https://bugs.webkit.org/show_bug.cgi?id=170331
+
+ Reviewed by Michael Catanzaro.
+
+ * WebKitDLL.cpp:
+ (shutDownWebKit): Call PlatformDisplay::shutDownEglDisplays in shutDownWebKit.
+
</ins><span class="cx"> 2017-03-30 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Expose a new AXSubrole for explicit ARIA "group" role
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitDLLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitDLL.cpp (214687 => 214688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitDLL.cpp 2017-03-31 21:46:42 UTC (rev 214687)
+++ trunk/Source/WebKit/win/WebKitDLL.cpp 2017-03-31 22:03:39 UTC (rev 214688)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include <WebCore/IconDatabase.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/PageGroup.h>
</span><ins>+#include <WebCore/PlatformDisplay.h>
</ins><span class="cx"> #include <WebCore/RenderThemeWin.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <WebCore/WebCoreInstanceHandle.h>
</span><span class="lines">@@ -164,6 +165,9 @@
</span><span class="cx"> {
</span><span class="cx"> WebCore::iconDatabase().close();
</span><span class="cx"> WebKit::WebStorageNamespaceProvider::closeLocalStorage();
</span><ins>+#if USE(EGL)
+ PlatformDisplay::shutDownEglDisplays();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //FIXME: We should consider moving this to a new file for cross-project functionality
</span></span></pre>
</div>
</div>
</body>
</html>