<!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>[170178] trunk/Source/WebKit2</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/170178">170178</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 00:31:04 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKContentViewInteraction isn't cleaned up when the Web Content process crashes
https://bugs.webkit.org/show_bug.cgi?id=134080
<rdar://problem/17387652> and <rdar://problem/16848360>
Reviewed by Benjamin Poulain.
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _processDidExit]):
Tear down WKContentViewInteraction when the process crashes.
(-[WKContentView _didRelaunchProcess]):
Set WKContentViewInteraction back up when the process is relaunched.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]):
Clear the SmartMagnificationController, which is a message receiver and thus must be re-created with the new page.
Remove all gesture recognizers from the content view.
Clear _fileUploadPanel, else we'll get an assert the next time we try to open one.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resetStateAfterProcessExited):
Give the PageClient a chance to clean up *before* we clean up internals;
it is at a higher level and some cleanup depends on WebPageProxy members
not having been cleared yet.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170177 => 170178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-20 07:10:34 UTC (rev 170177)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 07:31:04 UTC (rev 170178)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-06-20 Tim Horton <timothy_horton@apple.com>
+
+ WKContentViewInteraction isn't cleaned up when the Web Content process crashes
+ https://bugs.webkit.org/show_bug.cgi?id=134080
+ <rdar://problem/17387652> and <rdar://problem/16848360>
+
+ Reviewed by Benjamin Poulain.
+
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _processDidExit]):
+ Tear down WKContentViewInteraction when the process crashes.
+
+ (-[WKContentView _didRelaunchProcess]):
+ Set WKContentViewInteraction back up when the process is relaunched.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanupInteraction]):
+ Clear the SmartMagnificationController, which is a message receiver and thus must be re-created with the new page.
+ Remove all gesture recognizers from the content view.
+ Clear _fileUploadPanel, else we'll get an assert the next time we try to open one.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ Give the PageClient a chance to clean up *before* we clean up internals;
+ it is at a higher level and some cleanup depends on WebPageProxy members
+ not having been cleared yet.
+
</ins><span class="cx"> 2014-06-19 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Removed unused SPI -[WKWebView _runJavaScriptInMainFrame:].
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170177 => 170178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-20 07:10:34 UTC (rev 170177)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-20 07:31:04 UTC (rev 170178)
</span><span class="lines">@@ -4322,10 +4322,10 @@
</span><span class="cx"> m_loadStateAtProcessExit = m_mainFrame->frameLoadState().m_state;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_pageClient.processDidExit();
+
</ins><span class="cx"> resetState(ResetStateReason::WebProcessExited);
</span><span class="cx">
</span><del>- m_pageClient.processDidExit();
-
</del><span class="cx"> m_pageClient.clearAllEditCommands();
</span><span class="cx"> m_pendingLearnOrIgnoreWordMessageCount = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (170177 => 170178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-06-20 07:10:34 UTC (rev 170177)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-06-20 07:31:04 UTC (rev 170178)
</span><span class="lines">@@ -379,12 +379,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)_processDidExit
</span><span class="cx"> {
</span><del>- // FIXME: Implement.
</del><ins>+ [self cleanupInteraction];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didRelaunchProcess
</span><span class="cx"> {
</span><span class="cx"> [self _accessibilityRegisterUIProcessTokens];
</span><ins>+ [self setupInteraction];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didCommitLoadForMainFrame
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (170177 => 170178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-20 07:10:34 UTC (rev 170177)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-20 07:31:04 UTC (rev 170178)
</span><span class="lines">@@ -238,22 +238,36 @@
</span><span class="cx"> _webSelectionAssistant = nil;
</span><span class="cx"> _textSelectionAssistant = nil;
</span><span class="cx"> _actionSheetAssistant = nil;
</span><ins>+ _smartMagnificationController = nil;
</ins><span class="cx"> [_formInputSession invalidate];
</span><span class="cx"> _formInputSession = nil;
</span><span class="cx"> [_highlightView removeFromSuperview];
</span><span class="cx"> [_highlightRootView removeFromSuperview];
</span><ins>+
</ins><span class="cx"> [_touchEventGestureRecognizer setDelegate:nil];
</span><ins>+ [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
+
</ins><span class="cx"> [_singleTapGestureRecognizer setDelegate:nil];
</span><span class="cx"> [_singleTapGestureRecognizer setGestureRecognizedTarget:nil action:nil];
</span><span class="cx"> [_singleTapGestureRecognizer setResetTarget:nil action:nil];
</span><ins>+ [self removeGestureRecognizer:_singleTapGestureRecognizer.get()];
</ins><span class="cx">
</span><del>- [_doubleTapGestureRecognizer setDelegate:nil];
</del><span class="cx"> [_highlightLongPressGestureRecognizer setDelegate:nil];
</span><ins>+ [self removeGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
+
</ins><span class="cx"> [_longPressGestureRecognizer setDelegate:nil];
</span><ins>+ [self removeGestureRecognizer:_longPressGestureRecognizer.get()];
</ins><span class="cx">
</span><ins>+ [_doubleTapGestureRecognizer setDelegate:nil];
+ [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
+
+ [_twoFingerDoubleTapGestureRecognizer setDelegate:nil];
+ [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
+
</ins><span class="cx"> if (_fileUploadPanel) {
</span><span class="cx"> [_fileUploadPanel setDelegate:nil];
</span><span class="cx"> [_fileUploadPanel dismiss];
</span><ins>+ _fileUploadPanel = nil;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>