<!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>[248427] branches/safari-608.1-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/248427">248427</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-08-08 11:24:24 -0700 (Thu, 08 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/248039">r248039</a>. rdar://problem/54087592

    [iOS 13] Safari crashes when closing a tab with a focused element if the unified field has focus
    https://bugs.webkit.org/show_bug.cgi?id=200291
    <rdar://problem/53717946>

    Reviewed by Megan Gardner.

    Source/WebKit:

    Makes -requestAutocorrectionContextWithCompletionHandler: robust in the case where the web page has been closed,
    and there is no Connection object to use when waiting for a sync IPC response.

    Test: AutocorrectionTests.RequestAutocorrectionContextAfterClosingPage

    * UIProcess/ios/WKContentViewInteraction.mm:
    (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):

    Tools:

    Add an API test to exercise the scenario of synchronously requesting the autocorrection context immediately
    after closing the web view, while the web view's content view isn't the first responder.

    * TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm:
    * TestWebKitAPI/ios/UIKitSPI.h:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248039 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6081branchSourceWebKitChangeLog">branches/safari-608.1-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6081branchSourceWebKitUIProcessiosWKContentViewInteractionmm">branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#branchessafari6081branchToolsChangeLog">branches/safari-608.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6081branchToolsTestWebKitAPITestsiosAutocorrectionTestsIOSmm">branches/safari-608.1-branch/Tools/TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm</a></li>
<li><a href="#branchessafari6081branchToolsTestWebKitAPIiosUIKitSPIh">branches/safari-608.1-branch/Tools/TestWebKitAPI/ios/UIKitSPI.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6081branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Source/WebKit/ChangeLog (248426 => 248427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Source/WebKit/ChangeLog     2019-08-08 18:23:18 UTC (rev 248426)
+++ branches/safari-608.1-branch/Source/WebKit/ChangeLog        2019-08-08 18:24:24 UTC (rev 248427)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2019-08-08  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r248039. rdar://problem/54087592
+
+    [iOS 13] Safari crashes when closing a tab with a focused element if the unified field has focus
+    https://bugs.webkit.org/show_bug.cgi?id=200291
+    <rdar://problem/53717946>
+    
+    Reviewed by Megan Gardner.
+    
+    Source/WebKit:
+    
+    Makes -requestAutocorrectionContextWithCompletionHandler: robust in the case where the web page has been closed,
+    and there is no Connection object to use when waiting for a sync IPC response.
+    
+    Test: AutocorrectionTests.RequestAutocorrectionContextAfterClosingPage
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
+    
+    Tools:
+    
+    Add an API test to exercise the scenario of synchronously requesting the autocorrection context immediately
+    after closing the web view, while the web view's content view isn't the first responder.
+    
+    * TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm:
+    * TestWebKitAPI/ios/UIKitSPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248039 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-31  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            [iOS 13] Safari crashes when closing a tab with a focused element if the unified field has focus
+            https://bugs.webkit.org/show_bug.cgi?id=200291
+            <rdar://problem/53717946>
+
+            Reviewed by Megan Gardner.
+
+            Makes -requestAutocorrectionContextWithCompletionHandler: robust in the case where the web page has been closed,
+            and there is no Connection object to use when waiting for a sync IPC response.
+
+            Test: AutocorrectionTests.RequestAutocorrectionContextAfterClosingPage
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
+
+2019-08-08  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r248393. rdar://problem/54066685
</span><span class="cx"> 
</span><span class="cx">     Regression(r247784) ResourceLoadStatisticsMemoryStore / ResourceLoadStatisticsPersistentStorage may get destroyed on the wrong thread
</span></span></pre></div>
<a id="branchessafari6081branchSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (248426 => 248427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm     2019-08-08 18:23:18 UTC (rev 248426)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm        2019-08-08 18:24:24 UTC (rev 248427)
</span><span class="lines">@@ -3885,6 +3885,11 @@
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    if (!_page->hasRunningProcess()) {
+        completionHandler(WKAutocorrectionContext.emptyAutocorrectionContext);
+        return;
+    }
+
</ins><span class="cx">     // FIXME: Remove the synchronous call when <rdar://problem/16207002> is fixed.
</span><span class="cx">     const bool useSyncRequest = true;
</span><span class="cx"> 
</span><span class="lines">@@ -3899,7 +3904,6 @@
</span><span class="cx">     if (useSyncRequest) {
</span><span class="cx">         _page->process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::HandleAutocorrectionContext>(_page->pageID(), 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
</span><span class="cx">         [self _cancelPendingAutocorrectionContextHandler];
</span><del>-        return;
</del><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6081branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Tools/ChangeLog (248426 => 248427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Tools/ChangeLog     2019-08-08 18:23:18 UTC (rev 248426)
+++ branches/safari-608.1-branch/Tools/ChangeLog        2019-08-08 18:24:24 UTC (rev 248427)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2019-08-08  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r248039. rdar://problem/54087592
+
+    [iOS 13] Safari crashes when closing a tab with a focused element if the unified field has focus
+    https://bugs.webkit.org/show_bug.cgi?id=200291
+    <rdar://problem/53717946>
+    
+    Reviewed by Megan Gardner.
+    
+    Source/WebKit:
+    
+    Makes -requestAutocorrectionContextWithCompletionHandler: robust in the case where the web page has been closed,
+    and there is no Connection object to use when waiting for a sync IPC response.
+    
+    Test: AutocorrectionTests.RequestAutocorrectionContextAfterClosingPage
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
+    
+    Tools:
+    
+    Add an API test to exercise the scenario of synchronously requesting the autocorrection context immediately
+    after closing the web view, while the web view's content view isn't the first responder.
+    
+    * TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm:
+    * TestWebKitAPI/ios/UIKitSPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248039 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-31  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            [iOS 13] Safari crashes when closing a tab with a focused element if the unified field has focus
+            https://bugs.webkit.org/show_bug.cgi?id=200291
+            <rdar://problem/53717946>
+
+            Reviewed by Megan Gardner.
+
+            Add an API test to exercise the scenario of synchronously requesting the autocorrection context immediately
+            after closing the web view, while the web view's content view isn't the first responder.
+
+            * TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm:
+            * TestWebKitAPI/ios/UIKitSPI.h:
+
</ins><span class="cx"> 2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r248265. rdar://problem/54017843
</span></span></pre></div>
<a id="branchessafari6081branchToolsTestWebKitAPITestsiosAutocorrectionTestsIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Tools/TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm (248426 => 248427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Tools/TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm     2019-08-08 18:23:18 UTC (rev 248426)
+++ branches/safari-608.1-branch/Tools/TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm        2019-08-08 18:24:24 UTC (rev 248427)
</span><span class="lines">@@ -94,4 +94,20 @@
</span><span class="cx">     EXPECT_EQ(32, fontAfterScaling.pointSize);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(AutocorrectionTests, RequestAutocorrectionContextAfterClosingPage)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] init]);
+    [webView synchronouslyLoadTestPageNamed:@"autofocused-text-input"];
+
+    auto contentView = [webView textInputContentView];
+    [contentView resignFirstResponder];
+    [webView _close];
+
+    bool done = false;
+    [contentView requestAutocorrectionContextWithCompletionHandler:[&] (UIWKAutocorrectionContext *) {
+        done = true;
+    }];
+    TestWebKitAPI::Util::run(&done);
+}
+
</ins><span class="cx"> #endif // PLATFORM(IOS_FAMILY)
</span></span></pre></div>
<a id="branchessafari6081branchToolsTestWebKitAPIiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1-branch/Tools/TestWebKitAPI/ios/UIKitSPI.h (248426 => 248427)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1-branch/Tools/TestWebKitAPI/ios/UIKitSPI.h  2019-08-08 18:23:18 UTC (rev 248426)
+++ branches/safari-608.1-branch/Tools/TestWebKitAPI/ios/UIKitSPI.h     2019-08-08 18:24:24 UTC (rev 248427)
</span><span class="lines">@@ -156,8 +156,12 @@
</span><span class="cx"> @property (nonatomic) CGRect lastRect;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface UIWKAutocorrectionContext : NSObject
+@end
+
</ins><span class="cx"> @protocol UIWKInteractionViewProtocol
</span><span class="cx"> - (void)requestAutocorrectionRectsForString:(NSString *)input withCompletionHandler:(void (^)(UIWKAutocorrectionRects *rectsForInput))completionHandler;
</span><ins>+- (void)requestAutocorrectionContextWithCompletionHandler:(void (^)(UIWKAutocorrectionContext *autocorrectionContext))completionHandler;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</span></span></pre>
</div>
</div>

</body>
</html>