<!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>[214579] 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/214579">214579</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 16:41:59 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/214495">r214495</a>. rdar://problem/31242019</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari604114branchSourceJavaScriptCoreChangeLog">branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari604114branchSourceWebKit2ChangeLog">branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari604114branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari604114branchToolsChangeLog">branches/safari-604.1.14-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari604114branchToolsTestWebKitAPITestsWebKit2CocoaDoAfterNextPresentationUpdateAfterCrashmm">branches/safari-604.1.14-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm</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 (214578 => 214579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog 2017-03-29 23:41:55 UTC (rev 214578)
+++ branches/safari-604.1.14-branch/Source/JavaScriptCore/ChangeLog 2017-03-29 23:41:59 UTC (rev 214579)
</span><span class="lines">@@ -1,29 +1,33 @@
</span><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><del>- Cherry-pick r214449. rdar://problem/30787872
</del><ins>+ Cherry-pick r214495. rdar://problem/31242019
</ins><span class="cx">
</span><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><del>- Cherry-pick r214406. rdar://problem/30542960
</del><ins>+ Cherry-pick r214449. rdar://problem/30787872
</ins><span class="cx">
</span><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><del>- Cherry-pick r214404. rdar://problem/31095987
</del><ins>+ Cherry-pick r214406. rdar://problem/30542960
</ins><span class="cx">
</span><del>- 2017-03-24 Mark Lam <mark.lam@apple.com>
</del><ins>+ 2017-03-29 Jason Marcell <jmarcell@apple.com>
</ins><span class="cx">
</span><del>- Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
- https://bugs.webkit.org/show_bug.cgi?id=170086
- <rdar://problem/31253673>
</del><ins>+ Cherry-pick r214404. rdar://problem/31095987
</ins><span class="cx">
</span><del>- Reviewed by Saam Barati.
</del><ins>+ 2017-03-24 Mark Lam <mark.lam@apple.com>
</ins><span class="cx">
</span><del>- Adding some instrumentation in Heap::resumeThePeriphery() to dump some Heap state
- just before we RELEASE_ASSERT_NOT_REACHED.
</del><ins>+ Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
+ https://bugs.webkit.org/show_bug.cgi?id=170086
+ <rdar://problem/31253673>
</ins><span class="cx">
</span><del>- * heap/Heap.cpp:
- (JSC::Heap::resumeThePeriphery):
</del><ins>+ Reviewed by Saam Barati.
</ins><span class="cx">
</span><ins>+ Adding some instrumentation in Heap::resumeThePeriphery() to dump some Heap state
+ just before we RELEASE_ASSERT_NOT_REACHED.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::resumeThePeriphery):
+
</ins><span class="cx"> 2017-03-22 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for Error.stackTraceLimit.
</span></span></pre></div>
<a id="branchessafari604114branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog (214578 => 214579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog 2017-03-29 23:41:55 UTC (rev 214578)
+++ branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog 2017-03-29 23:41:59 UTC (rev 214579)
</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 r214495. rdar://problem/31242019
+
+ 2017-03-28 Timothy Horton <timothy_horton@apple.com>
+
+ Safari crashes when attempting to close tab that is displaying PDF
+ https://bugs.webkit.org/show_bug.cgi?id=170201
+ <rdar://problem/31242019>
+
+ Reviewed by Wenson Hsieh.
+
+ * 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.
+
+2017-03-29 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Cherry-pick r214449. rdar://problem/30787872
</span><span class="cx">
</span><span class="cx"> 2017-03-27 Andy Estes <aestes@apple.com>
</span></span></pre></div>
<a id="branchessafari604114branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (214578 => 214579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-29 23:41:55 UTC (rev 214578)
+++ branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-29 23:41:59 UTC (rev 214579)
</span><span class="lines">@@ -5143,22 +5143,24 @@
</span><span class="cx">
</span><span class="cx"> - (void)_doAfterNextStablePresentationUpdate:(dispatch_block_t)updateBlock
</span><span class="cx"> {
</span><del>- updateBlock = Block_copy(updateBlock);
</del><ins>+ auto updateBlockCopy = makeBlockPtr(updateBlock);
+
</ins><span class="cx"> if (_stableStatePresentationUpdateCallbacks)
</span><del>- [_stableStatePresentationUpdateCallbacks addObject:updateBlock];
</del><ins>+ [_stableStatePresentationUpdateCallbacks addObject:updateBlockCopy.get()];
</ins><span class="cx"> else {
</span><del>- _stableStatePresentationUpdateCallbacks = adoptNS([[NSMutableArray alloc] initWithObjects:Block_copy(updateBlock), nil]);
</del><ins>+ _stableStatePresentationUpdateCallbacks = adoptNS([[NSMutableArray alloc] initWithObjects:updateBlockCopy.get(), nil]);
</ins><span class="cx"> [self _firePresentationUpdateForPendingStableStatePresentationCallbacks];
</span><span class="cx"> }
</span><del>- Block_release(updateBlock);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_firePresentationUpdateForPendingStableStatePresentationCallbacks
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WKWebView> strongSelf = self;
</span><del>- [self _doAfterNextPresentationUpdate:^() {
- if ([strongSelf->_stableStatePresentationUpdateCallbacks count])
- [strongSelf _firePresentationUpdateForPendingStableStatePresentationCallbacks];
</del><ins>+ [self _doAfterNextPresentationUpdate:[strongSelf] {
+ dispatch_async(dispatch_get_main_queue(), [strongSelf] {
+ if ([strongSelf->_stableStatePresentationUpdateCallbacks count])
+ [strongSelf _firePresentationUpdateForPendingStableStatePresentationCallbacks];
+ });
</ins><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari604114branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Tools/ChangeLog (214578 => 214579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Tools/ChangeLog 2017-03-29 23:41:55 UTC (rev 214578)
+++ branches/safari-604.1.14-branch/Tools/ChangeLog 2017-03-29 23:41:59 UTC (rev 214579)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-28 Timothy Horton <timothy_horton@apple.com>
+
+ Safari crashes when attempting to close tab that is displaying PDF
+ https://bugs.webkit.org/show_bug.cgi?id=170201
+ <rdar://problem/31242019>
+
+ 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>
<a id="branchessafari604114branchToolsTestWebKitAPITestsWebKit2CocoaDoAfterNextPresentationUpdateAfterCrashmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm (214578 => 214579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm 2017-03-29 23:41:55 UTC (rev 214578)
+++ branches/safari-604.1.14-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm 2017-03-29 23:41:59 UTC (rev 214579)
</span><span class="lines">@@ -53,4 +53,24 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&gotCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WebKit2, DoAfterNextStablePresentationUpdateAfterCrash)
+{
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
+
+ [webView loadHTMLString:@"test" baseURL:nil];
+ [webView _test_waitForDidFinishNavigation];
+
+ [webView _killWebContentProcessAndResetState];
+
+ __block bool gotCallback = false;
+ [webView _doAfterNextStablePresentationUpdate:^ {
+ gotCallback = true;
+ }];
+
+ [webView loadHTMLString:@"test" baseURL:nil];
+ [webView _test_waitForDidFinishNavigation];
+
+ TestWebKitAPI::Util::run(&gotCallback);
+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>