<!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>[214580] branches/safari-604.1.14-branch</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/214580">214580</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 16:42:02 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/214509">r214509</a>. rdar://problem/30755345</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari604114branchSourceJavaScriptCoreChangeLog">branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari604114branchSourceJavaScriptCoreheapHeapcpp">branches/safari-604.1.14-branch/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#branchessafari604114branchSourceWebKit2ChangeLog">branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari604114branchToolsChangeLog">branches/safari-604.1.14-branch/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari604114branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog (214579 => 214580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog 2017-03-29 23:41:59 UTC (rev 214579)
+++ branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog 2017-03-29 23:42:02 UTC (rev 214580)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Cherry-pick r214509. rdar://problem/30755345
+
+ 2017-03-28 Mark Lam <mark.lam@apple.com>
+
+ The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
+ https://bugs.webkit.org/show_bug.cgi?id=170213
+ <rdar://problem/30755345>
+
+ Reviewed by Filip Pizlo.
+
+ The current condition for stealing the conn isn't tight enough. Restricting the
+ stealing to when m_currentPhase == NotRunning ensures that the Collector is
+ really done running.
+
+ No test because this issue only manifests with a race condition that is difficult
+ to reproduce on demand.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::requestCollection):
+
+2017-03-29 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Cherry-pick r214495. rdar://problem/31242019
</span><span class="cx">
</span><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span></span></pre></div>
<a id="branchessafari604114branchSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/JavaScriptCore/heap/Heap.cpp (214579 => 214580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/JavaScriptCore/heap/Heap.cpp 2017-03-29 23:41:59 UTC (rev 214579)
+++ branches/safari-604.1.14-branch/Source/JavaScriptCore/heap/Heap.cpp 2017-03-29 23:42:02 UTC (rev 214580)
</span><span class="lines">@@ -1961,7 +1961,7 @@
</span><span class="cx"> // right now. This is an optimization that prevents the collector thread from ever starting in most
</span><span class="cx"> // cases.
</span><span class="cx"> ASSERT(m_lastServedTicket <= m_lastGrantedTicket);
</span><del>- if (m_lastServedTicket == m_lastGrantedTicket) {
</del><ins>+ if ((m_lastServedTicket == m_lastGrantedTicket) && (m_currentPhase == CollectorPhase::NotRunning)) {
</ins><span class="cx"> if (false)
</span><span class="cx"> dataLog("Taking the conn.\n");
</span><span class="cx"> m_worldState.exchangeOr(mutatorHasConnBit);
</span></span></pre></div>
<a id="branchessafari604114branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog (214579 => 214580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog 2017-03-29 23:41:59 UTC (rev 214579)
+++ branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog 2017-03-29 23:42:02 UTC (rev 214580)
</span><span class="lines">@@ -1,25 +1,29 @@
</span><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><del>- Cherry-pick r214495. rdar://problem/31242019
</del><ins>+ Cherry-pick r214509. rdar://problem/30755345
</ins><span class="cx">
</span><del>- 2017-03-28 Timothy Horton <timothy_horton@apple.com>
</del><ins>+ 2017-03-29 Jason Marcell <jmarcell@apple.com>
</ins><span class="cx">
</span><del>- Safari crashes when attempting to close tab that is displaying PDF
- https://bugs.webkit.org/show_bug.cgi?id=170201
- <rdar://problem/31242019>
</del><ins>+ Cherry-pick r214495. rdar://problem/31242019
</ins><span class="cx">
</span><del>- Reviewed by Wenson Hsieh.
</del><ins>+ 2017-03-28 Timothy Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- * UIProcess/API/Cocoa/WKWebView.mm:
- (-[WKWebView _doAfterNextStablePresentationUpdate:]):
- Adopt BlockPtr to fix a leak.
</del><ins>+ Safari crashes when attempting to close tab that is displaying PDF
+ https://bugs.webkit.org/show_bug.cgi?id=170201
+ <rdar://problem/31242019>
</ins><span class="cx">
</span><del>- (-[WKWebView _firePresentationUpdateForPendingStableStatePresentationCallbacks]):
- dispatch_async in the doAfterNextPresentationUpdate callback; since this
- recursively calls itself, in cases where doAfterNextPresentationUpdate
- returns synchronously (e.g. if the Web Process is missing), we would
- recurse infinitely.
</del><ins>+ Reviewed by Wenson Hsieh.
</ins><span class="cx">
</span><ins>+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _doAfterNextStablePresentationUpdate:]):
+ Adopt BlockPtr to fix a leak.
+
+ (-[WKWebView _firePresentationUpdateForPendingStableStatePresentationCallbacks]):
+ dispatch_async in the doAfterNextPresentationUpdate callback; since this
+ recursively calls itself, in cases where doAfterNextPresentationUpdate
+ returns synchronously (e.g. if the Web Process is missing), we would
+ recurse infinitely.
+
</ins><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r214449. rdar://problem/30787872
</span></span></pre></div>
<a id="branchessafari604114branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Tools/ChangeLog (214579 => 214580)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Tools/ChangeLog 2017-03-29 23:41:59 UTC (rev 214579)
+++ branches/safari-604.1.14-branch/Tools/ChangeLog 2017-03-29 23:42:02 UTC (rev 214580)
</span><span class="lines">@@ -1,16 +1,20 @@
</span><del>-2017-03-28 Timothy Horton <timothy_horton@apple.com>
</del><ins>+2017-03-29 Jason Marcell <jmarcell@apple.com>
</ins><span class="cx">
</span><del>- Safari crashes when attempting to close tab that is displaying PDF
- https://bugs.webkit.org/show_bug.cgi?id=170201
- <rdar://problem/31242019>
</del><ins>+ Cherry-pick r214509. rdar://problem/30755345
</ins><span class="cx">
</span><del>- Reviewed by Wenson Hsieh.
</del><ins>+ 2017-03-28 Timothy Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- * TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm:
- (TEST):
- Add a test for doAfterNextStablePresentationUpdate just like the existing
- non-stable one.
</del><ins>+ Safari crashes when attempting to close tab that is displaying PDF
+ https://bugs.webkit.org/show_bug.cgi?id=170201
+ <rdar://problem/31242019>
</ins><span class="cx">
</span><ins>+ Reviewed by Wenson Hsieh.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm:
+ (TEST):
+ Add a test for doAfterNextStablePresentationUpdate just like the existing
+ non-stable one.
+
</ins><span class="cx"> 2017-03-22 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Only run volume-related autoplay policy tests on Mac.
</span></span></pre>
</div>
</div>
</body>
</html>