<!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>[177459] 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/177459">177459</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-17 13:19:21 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: [Mac] Occosional Crashes Closing Inspector
https://bugs.webkit.org/show_bug.cgi?id=139740
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-12-17
Reviewed by Timothy Hatcher.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didReceiveEvent):
The WebPageProxy could have gotten destroyed in handling (e.g. keyboard shortcut
to close the Inspector Window), so protect the object to avoid destruction
during handling.
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebPageProxy.cpp:
Add platformInvalidate opportunity for the platform to do invalidation work.
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformInvalidate):
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformInvalidate):
Empty implementations, these ports do not need to do anything.
* UIProcess/WebInspectorProxy.h:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::closeTimerFired):
(WebKit::WebInspectorProxy::platformDidClose):
(WebKit::WebInspectorProxy::platformInvalidate):
When closing / invalidating make sure we close the WKView to clear client
for any delayed callbacks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-12-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: [Mac] Occosional Crashes Closing Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=139740
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveEvent):
+ The WebPageProxy could have gotten destroyed in handling (e.g. keyboard shortcut
+ to close the Inspector Window), so protect the object to avoid destruction
+ during handling.
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ Add platformInvalidate opportunity for the platform to do invalidation work.
+
+ * UIProcess/efl/WebInspectorProxyEfl.cpp:
+ (WebKit::WebInspectorProxy::platformInvalidate):
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformInvalidate):
+ Empty implementations, these ports do not need to do anything.
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::closeTimerFired):
+ (WebKit::WebInspectorProxy::platformDidClose):
+ (WebKit::WebInspectorProxy::platformInvalidate):
+ When closing / invalidating make sure we close the WKView to clear client
+ for any delayed callbacks.
+
</ins><span class="cx"> 2014-12-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Make it possible to toggle FeatureCounter support at runtime
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx"> m_page->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID());
</span><span class="cx">
</span><span class="cx"> didClose();
</span><ins>+ platformInvalidate();
</ins><span class="cx">
</span><span class="cx"> m_page = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -157,6 +157,7 @@
</span><span class="cx"> WebPageProxy* platformCreateInspectorPage();
</span><span class="cx"> void platformOpen();
</span><span class="cx"> void platformDidClose();
</span><ins>+ void platformInvalidate();
</ins><span class="cx"> void platformBringToFront();
</span><span class="cx"> void platformHide();
</span><span class="cx"> bool platformIsFront();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -4219,6 +4219,10 @@
</span><span class="cx"> if (!m_keyEventQueue.isEmpty())
</span><span class="cx"> m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
</span><span class="cx">
</span><ins>+ // The call to doneWithKeyEvent may close this WebPage.
+ // Protect against this being destroyed.
+ Ref<WebPageProxy> protect(*this);
+
</ins><span class="cx"> m_pageClient.doneWithKeyEvent(event, handled);
</span><span class="cx"> if (handled)
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -142,6 +142,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformInvalidate()
+{
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformHide()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -168,6 +168,10 @@
</span><span class="cx"> m_inspectorView = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformInvalidate()
+{
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformHide()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (177458 => 177459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-12-17 21:15:41 UTC (rev 177458)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-12-17 21:19:21 UTC (rev 177459)
</span><span class="lines">@@ -291,7 +291,11 @@
</span><span class="cx"> if (m_isAttached || m_inspectorWindow)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_inspectorView = nil;
</del><ins>+ if (m_inspectorView) {
+ WebPageProxy* inspectorPage = toImpl(m_inspectorView.get().pageRef);
+ inspectorPage->close();
+ m_inspectorView = nil;
+ }
</ins><span class="cx">
</span><span class="cx"> [m_inspectorProxyObjCAdapter close];
</span><span class="cx"> m_inspectorProxyObjCAdapter = nil;
</span><span class="lines">@@ -544,6 +548,13 @@
</span><span class="cx"> m_closeTimer.startOneShot(webViewCloseTimeout);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformInvalidate()
+{
+ m_closeTimer.stop();
+
+ closeTimerFired();
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformHide()
</span><span class="cx"> {
</span><span class="cx"> if (m_isAttached) {
</span></span></pre>
</div>
</div>
</body>
</html>