<!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>[206410] 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/206410">206410</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-09-26 20:35:01 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>-_webViewWebProcessDidBecomeUnresponsive: gets called when the Web process is stopped in the debugger
https://bugs.webkit.org/show_bug.cgi?id=162234
Reviewed by Sam Weinig.
* UIProcess/Cocoa/WebProcessProxyCocoa.mm:
(WebKit::WebProcessProxy::platformIsBeingDebugged): Use the KERN_PROC sysctl to get the
process flags and check for P_TRACED.
* UIProcess/ResponsivenessTimer.cpp:
(WebKit::ResponsivenessTimer::timerFired): Call the new client function
mayBecomeUnresponsive. If it returns false, restart the timer and bail out without
changing the responsiveness state.
* UIProcess/ResponsivenessTimer.h: Declared new client function mayBecomeUnresponsive.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::platformIsBeingDebugged): A generic implementation that always
returns false.
(WebKit::WebProcessProxy::mayBecomeUnresponsive): Implement this new
ResponsivenessTimer::Client function to return true unless the process is being debugged.
* UIProcess/WebProcessProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessResponsivenessTimercpp">trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessResponsivenessTimerh">trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206409 => 206410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-27 03:06:26 UTC (rev 206409)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-27 03:35:01 UTC (rev 206410)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-09-26 Dan Bernstein <mitz@apple.com>
+
+ -_webViewWebProcessDidBecomeUnresponsive: gets called when the Web process is stopped in the debugger
+ https://bugs.webkit.org/show_bug.cgi?id=162234
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::platformIsBeingDebugged): Use the KERN_PROC sysctl to get the
+ process flags and check for P_TRACED.
+
+ * UIProcess/ResponsivenessTimer.cpp:
+ (WebKit::ResponsivenessTimer::timerFired): Call the new client function
+ mayBecomeUnresponsive. If it returns false, restart the timer and bail out without
+ changing the responsiveness state.
+
+ * UIProcess/ResponsivenessTimer.h: Declared new client function mayBecomeUnresponsive.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::platformIsBeingDebugged): A generic implementation that always
+ returns false.
+ (WebKit::WebProcessProxy::mayBecomeUnresponsive): Implement this new
+ ResponsivenessTimer::Client function to return true unless the process is being debugged.
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2016-09-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] BlobDownloadClient should use asynchronous IPC to decide destination path
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm (206409 => 206410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2016-09-27 03:06:26 UTC (rev 206409)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2016-09-27 03:35:01 UTC (rev 206410)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextHandleInternal.h"
</span><span class="cx"> #import "WKTypeRefWrapper.h"
</span><ins>+#import <sys/sysctl.h>
</ins><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -120,4 +121,15 @@
</span><span class="cx"> return ObjCObjectGraph::create(ObjCObjectGraph::transform(objectGraph.rootObject(), Transformer()).get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebProcessProxy::platformIsBeingDebugged() const
+{
+ struct kinfo_proc info;
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, processIdentifier() };
+ size_t size = sizeof(info);
+ if (sysctl(mib, WTF_ARRAY_LENGTH(mib), &info, &size, nullptr, 0) == -1)
+ return false;
+
+ return info.kp_proc.p_flag & P_TRACED;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp (206409 => 206410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2016-09-27 03:06:26 UTC (rev 206409)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2016-09-27 03:35:01 UTC (rev 206410)
</span><span class="lines">@@ -52,6 +52,11 @@
</span><span class="cx"> if (!m_isResponsive)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!m_client.mayBecomeUnresponsive()) {
+ m_timer.startOneShot(responsivenessTimeout);
+ return;
+ }
+
</ins><span class="cx"> m_client.willChangeIsResponsive();
</span><span class="cx"> m_isResponsive = false;
</span><span class="cx"> m_client.didChangeIsResponsive();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h (206409 => 206410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2016-09-27 03:06:26 UTC (rev 206409)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2016-09-27 03:35:01 UTC (rev 206410)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void willChangeIsResponsive() = 0;
</span><span class="cx"> virtual void didChangeIsResponsive() = 0;
</span><ins>+
+ virtual bool mayBecomeUnresponsive() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> explicit ResponsivenessTimer(ResponsivenessTimer::Client&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (206409 => 206410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-09-27 03:06:26 UTC (rev 206409)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-09-27 03:35:01 UTC (rev 206410)
</span><span class="lines">@@ -472,6 +472,13 @@
</span><span class="cx"> m_pageURLRetainCountMap.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+bool WebProcessProxy::platformIsBeingDebugged() const
+{
+ return false;
+}
+#endif
+
</ins><span class="cx"> void WebProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> if (dispatchMessage(connection, decoder))
</span><span class="lines">@@ -579,6 +586,11 @@
</span><span class="cx"> page->didChangeProcessIsResponsive();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebProcessProxy::mayBecomeUnresponsive()
+{
+ return !platformIsBeingDebugged();
+}
+
</ins><span class="cx"> void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (206409 => 206410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-09-27 03:06:26 UTC (rev 206409)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-09-27 03:35:01 UTC (rev 206410)
</span><span class="lines">@@ -186,6 +186,8 @@
</span><span class="cx"> void releaseIconForPageURL(const String& pageURL);
</span><span class="cx"> void releaseRemainingIconsForPageURLs();
</span><span class="cx">
</span><ins>+ bool platformIsBeingDebugged() const;
+
</ins><span class="cx"> static const HashSet<String>& platformPathsWithAssumedReadAccess();
</span><span class="cx">
</span><span class="cx"> // IPC::Connection::Client
</span><span class="lines">@@ -200,6 +202,7 @@
</span><span class="cx"> void didBecomeResponsive() override;
</span><span class="cx"> void willChangeIsResponsive() override;
</span><span class="cx"> void didChangeIsResponsive() override;
</span><ins>+ bool mayBecomeUnresponsive() override;
</ins><span class="cx">
</span><span class="cx"> // ProcessThrottlerClient
</span><span class="cx"> void sendProcessWillSuspendImminently() override;
</span></span></pre>
</div>
</div>
</body>
</html>