<!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>[213032] releases/WebKitGTK/webkit-2.16</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/213032">213032</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-26 23:55:01 -0800 (Sun, 26 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212698">r212698</a> - ASSERTION FAILED: m_normalWorld->hasOneRef() under WorkerThread::stop
https://bugs.webkit.org/show_bug.cgi?id=168356
<rdar://problem/30592486>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-02-20
Reviewed by Ryosuke Niwa.
Source/WebCore:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::removeAllEventListeners):
Remove Performance object EventListeners.
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::~WorkerGlobalScope):
(WebCore::WorkerGlobalScope::removeAllEventListeners):
(WebCore::WorkerGlobalScope::performance):
* workers/WorkerGlobalScope.h:
Remove Performance object EventListeners.
Also clear Performance early in destruction since its ContextDestructionObserver
destruction makes checks about the WorkerThread.
LayoutTests:
* TestExpectations:
Unskip tests now that they no longer trigger assertions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsTestExpectations">releases/WebKitGTK/webkit-2.16/LayoutTests/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorepageDOMWindowcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreworkersWorkerGlobalScopecpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreworkersWorkerGlobalScopeh">releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (213031 => 213032)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-02-27 07:52:15 UTC (rev 213031)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-02-27 07:55:01 UTC (rev 213032)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ ASSERTION FAILED: m_normalWorld->hasOneRef() under WorkerThread::stop
+ https://bugs.webkit.org/show_bug.cgi?id=168356
+ <rdar://problem/30592486>
+
+ Reviewed by Ryosuke Niwa.
+
+ * TestExpectations:
+ Unskip tests now that they no longer trigger assertions.
+
</ins><span class="cx"> 2017-02-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Implement absoluteQuadsForRange.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/TestExpectations (213031 => 213032)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/TestExpectations 2017-02-27 07:52:15 UTC (rev 213031)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/TestExpectations 2017-02-27 07:55:01 UTC (rev 213032)
</span><span class="lines">@@ -310,9 +310,8 @@
</span><span class="cx"> # Failing assertion with dynamic message
</span><span class="cx"> imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm [ Failure ]
</span><span class="cx">
</span><del>-# Failing with dynamic URLs.
</del><ins>+webkit.org/b/161088 imported/w3c/web-platform-tests/resource-timing/resource-timing.html [ Pass Failure ]
</ins><span class="cx"> webkit.org/b/168357 imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media.html [ Failure ]
</span><del>-
</del><span class="cx"> webkit.org/b/168448 imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/168448 imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers.html [ Pass Failure ]
</span><span class="cx">
</span><span class="lines">@@ -979,10 +978,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/160017 js/regress-139548.html [ Slow ]
</span><span class="cx">
</span><del>-webkit.org/b/161088 imported/w3c/web-platform-tests/resource-timing/resource-timing.html [ Pass Failure ]
-
-webkit.org/b/168356 [ Debug ] imported/w3c/web-platform-tests/resource-timing [ Skip ]
-
</del><span class="cx"> # Only iOS has implemented lettepress.
</span><span class="cx"> fast/text/letterpress-different.html [ ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213031 => 213032)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 07:52:15 UTC (rev 213031)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 07:55:01 UTC (rev 213032)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ ASSERTION FAILED: m_normalWorld->hasOneRef() under WorkerThread::stop
+ https://bugs.webkit.org/show_bug.cgi?id=168356
+ <rdar://problem/30592486>
+
+ Reviewed by Ryosuke Niwa.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::removeAllEventListeners):
+ Remove Performance object EventListeners.
+
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::~WorkerGlobalScope):
+ (WebCore::WorkerGlobalScope::removeAllEventListeners):
+ (WebCore::WorkerGlobalScope::performance):
+ * workers/WorkerGlobalScope.h:
+ Remove Performance object EventListeners.
+ Also clear Performance early in destruction since its ContextDestructionObserver
+ destruction makes checks about the WorkerThread.
+
</ins><span class="cx"> 2017-02-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Implement absoluteQuadsForRange.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/page/DOMWindow.cpp (213031 => 213032)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/page/DOMWindow.cpp 2017-02-27 07:52:15 UTC (rev 213031)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/page/DOMWindow.cpp 2017-02-27 07:55:01 UTC (rev 213032)
</span><span class="lines">@@ -2027,6 +2027,11 @@
</span><span class="cx"> controller->removeAllDeviceEventListeners(this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_TIMING)
+ if (m_performance)
+ m_performance->removeAllEventListeners();
+#endif
+
</ins><span class="cx"> removeAllUnloadEventListeners(this);
</span><span class="cx"> removeAllBeforeUnloadEventListeners(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.cpp (213031 => 213032)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.cpp 2017-02-27 07:52:15 UTC (rev 213031)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.cpp 2017-02-27 07:55:01 UTC (rev 213032)
</span><span class="lines">@@ -97,10 +97,23 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == thread().threadID());
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_TIMING)
+ m_performance = nullptr;
+#endif
+
</ins><span class="cx"> // Notify proxy that we are going away. This can free the WorkerThread object, so do not access it after this.
</span><span class="cx"> thread().workerReportingProxy().workerGlobalScopeDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WorkerGlobalScope::removeAllEventListeners()
+{
+ EventTarget::removeAllEventListeners();
+
+#if ENABLE(WEB_TIMING)
+ m_performance->removeAllEventListeners();
+#endif
+}
+
</ins><span class="cx"> void WorkerGlobalScope::applyContentSecurityPolicyResponseHeaders(const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders)
</span><span class="cx"> {
</span><span class="cx"> contentSecurityPolicy()->didReceiveHeaders(contentSecurityPolicyResponseHeaders);
</span><span class="lines">@@ -358,7 +371,7 @@
</span><span class="cx">
</span><span class="cx"> Performance& WorkerGlobalScope::performance() const
</span><span class="cx"> {
</span><del>- return m_performance;
</del><ins>+ return *m_performance;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.h (213031 => 213032)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.h 2017-02-27 07:52:15 UTC (rev 213031)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/workers/WorkerGlobalScope.h 2017-02-27 07:55:01 UTC (rev 213032)
</span><span class="lines">@@ -104,6 +104,8 @@
</span><span class="cx"> Performance& performance() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void removeAllEventListeners() final;
+
</ins><span class="cx"> protected:
</span><span class="cx"> WorkerGlobalScope(const URL&, const String& identifier, const String& userAgent, WorkerThread&, bool shouldBypassMainWorldContentSecurityPolicy, Ref<SecurityOrigin>&& topOrigin, MonotonicTime timeOrigin, IDBClient::IDBConnectionProxy*, SocketProvider*);
</span><span class="cx">
</span><span class="lines">@@ -177,7 +179,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- Ref<Performance> m_performance;
</del><ins>+ RefPtr<Performance> m_performance;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> mutable RefPtr<Crypto> m_crypto;
</span></span></pre>
</div>
</div>
</body>
</html>