<!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>[208869] trunk/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/208869">208869</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-17 16:55:34 -0800 (Thu, 17 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/208672">r208672</a>?): ASSERTION FAILED: isMainThread() in WebCore::Node::ref()
https://bugs.webkit.org/show_bug.cgi?id=164887
<rdar://problem/29319497>
Reviewed by Brady Eidson.
Restore pre-<a href="http://trac.webkit.org/projects/webkit/changeset/208672">r208672</a> behavior where we do not ref the script execution context in the
background thread since this is unsafe. We use WTFMove(m_scriptExecutionContext)
instead of m_scriptExecutionContext.copyRef(). Before <a href="http://trac.webkit.org/projects/webkit/changeset/208672">r208672</a>, it was calling
m_scriptExecutionContext.releaseNonNull() because m_scriptExecutionContext was a
RefPtr instead of a Ref. Note that copyRef() causes 2 issues here:
1. It refs the scriptExecutionContext in a non-main thread which is unsafe and asserts.
2. The point of this postTask in the destructor is to make sure the scriptExecutionContext
gets destroyed in the main thread so we definitely want to *transfer* ownership of
m_scriptExecutionContext to the main thread, not ref it to pass it to the main thread.
No new tests, already covered by storage/websql/multiple-transactions-on-different-handles.html.
* Modules/webdatabase/Database.cpp:
(WebCore::Database::~Database):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208868 => 208869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-18 00:48:06 UTC (rev 208868)
+++ trunk/Source/WebCore/ChangeLog 2016-11-18 00:55:34 UTC (rev 208869)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-17 Chris Dumez <cdumez@apple.com>
+
+ Regression(r208672?): ASSERTION FAILED: isMainThread() in WebCore::Node::ref()
+ https://bugs.webkit.org/show_bug.cgi?id=164887
+ <rdar://problem/29319497>
+
+ Reviewed by Brady Eidson.
+
+ Restore pre-r208672 behavior where we do not ref the script execution context in the
+ background thread since this is unsafe. We use WTFMove(m_scriptExecutionContext)
+ instead of m_scriptExecutionContext.copyRef(). Before r208672, it was calling
+ m_scriptExecutionContext.releaseNonNull() because m_scriptExecutionContext was a
+ RefPtr instead of a Ref. Note that copyRef() causes 2 issues here:
+ 1. It refs the scriptExecutionContext in a non-main thread which is unsafe and asserts.
+ 2. The point of this postTask in the destructor is to make sure the scriptExecutionContext
+ gets destroyed in the main thread so we definitely want to *transfer* ownership of
+ m_scriptExecutionContext to the main thread, not ref it to pass it to the main thread.
+
+ No new tests, already covered by storage/websql/multiple-transactions-on-different-handles.html.
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::~Database):
+
</ins><span class="cx"> 2016-11-17 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add _WKIconLoadingDelegate SPI.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (208868 => 208869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2016-11-18 00:48:06 UTC (rev 208868)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2016-11-18 00:55:34 UTC (rev 208869)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> {
</span><span class="cx"> // The reference to the ScriptExecutionContext needs to be cleared on the JavaScript thread. If we're on that thread already, we can just let the RefPtr's destruction do the dereffing.
</span><span class="cx"> if (!m_scriptExecutionContext->isContextThread()) {
</span><del>- auto passedContext = m_scriptExecutionContext.copyRef();
</del><ins>+ auto passedContext = WTFMove(m_scriptExecutionContext);
</ins><span class="cx"> auto& contextRef = passedContext.get();
</span><span class="cx"> contextRef.postTask({ScriptExecutionContext::Task::CleanupTask, [passedContext = WTFMove(passedContext)] (ScriptExecutionContext& context) {
</span><span class="cx"> ASSERT_UNUSED(context, &context == passedContext.ptr());
</span></span></pre>
</div>
</div>
</body>
</html>