<!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>[191895] 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/191895">191895</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-02 10:26:39 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add objC delegate callback for webProcessDidBecomeResponsive and webProcessDidBecomeUnresponsive.
https://bugs.webkit.org/show_bug.cgi?id=150778
Add methods into WKNavigationDelegatePrivate to notify WebKit client when web process becomes unresponsive
or responsive, which is reported by WebKit::ResponsivenessTimer.
Patch by Yongjun Zhang <yongjun_zhang@apple.com> on 2015-11-02
Reviewed by Darin Adler.
* UIProcess/API/APINavigationClient.h: Add two new method processDidBecomeResponsive and processDidBecomeUnresponsive
to NavigationClient; they are called when WebKit::ResponsivenessTimer update its client's state.
(API::NavigationClient::processDidBecomeResponsive):
(API::NavigationClient::processDidBecomeUnresponsive):
* UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: Add two new delegate method to WKNavigationDelegatePrivate:
_webViewWebProcessDidBecomeResponsive: and _webViewWebProcessDidBecomeUnresponsive:
* UIProcess/Cocoa/NavigationState.h: Add new overriding methods processDidBecomeResponsive and processDidBecomeUnresponsive.
Also add a bool member for each method to indicate if the delegate has implement the related method.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::setNavigationDelegate): Update the new bool members based on the delegate.
(WebKit::NavigationState::NavigationClient::processDidBecomeResponsive): Send the delegate message to navigationDelegate
if _webViewWebProcessDidBecomeResponsive: is implemented.
(WebKit::NavigationState::NavigationClient::processDidBecomeUnresponsive): Ditto.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::processDidBecomeUnresponsive): Call navigationClient's processDidBecomeUnresponsive if the page proxy
has navigationClient.
(WebKit::WebPageProxy::processDidBecomeResponsive): Call navigationClient's processDidBecomeResponsive if the page proxy
has navigationClient.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPINavigationClienth">trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191894 => 191895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-11-02 18:24:49 UTC (rev 191894)
+++ trunk/Source/WebKit2/ChangeLog        2015-11-02 18:26:39 UTC (rev 191895)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-11-02 Yongjun Zhang <yongjun_zhang@apple.com>
+
+ Add objC delegate callback for webProcessDidBecomeResponsive and webProcessDidBecomeUnresponsive.
+ https://bugs.webkit.org/show_bug.cgi?id=150778
+
+ Add methods into WKNavigationDelegatePrivate to notify WebKit client when web process becomes unresponsive
+ or responsive, which is reported by WebKit::ResponsivenessTimer.
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/APINavigationClient.h: Add two new method processDidBecomeResponsive and processDidBecomeUnresponsive
+ to NavigationClient; they are called when WebKit::ResponsivenessTimer update its client's state.
+ (API::NavigationClient::processDidBecomeResponsive):
+ (API::NavigationClient::processDidBecomeUnresponsive):
+ * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: Add two new delegate method to WKNavigationDelegatePrivate:
+ _webViewWebProcessDidBecomeResponsive: and _webViewWebProcessDidBecomeUnresponsive:
+ * UIProcess/Cocoa/NavigationState.h: Add new overriding methods processDidBecomeResponsive and processDidBecomeUnresponsive.
+ Also add a bool member for each method to indicate if the delegate has implement the related method.
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::setNavigationDelegate): Update the new bool members based on the delegate.
+ (WebKit::NavigationState::NavigationClient::processDidBecomeResponsive): Send the delegate message to navigationDelegate
+ if _webViewWebProcessDidBecomeResponsive: is implemented.
+ (WebKit::NavigationState::NavigationClient::processDidBecomeUnresponsive): Ditto.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::processDidBecomeUnresponsive): Call navigationClient's processDidBecomeUnresponsive if the page proxy
+ has navigationClient.
+ (WebKit::WebPageProxy::processDidBecomeResponsive): Call navigationClient's processDidBecomeResponsive if the page proxy
+ has navigationClient.
+
</ins><span class="cx"> 2015-11-02 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Tapping and holding a link should have a share option
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPINavigationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h (191894 => 191895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h        2015-11-02 18:24:49 UTC (rev 191894)
+++ trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h        2015-11-02 18:26:39 UTC (rev 191895)
</span><span class="lines">@@ -81,8 +81,10 @@
</span><span class="cx"> virtual bool canAuthenticateAgainstProtectionSpace(WebKit::WebPageProxy&, WebKit::WebProtectionSpace*) { return false; }
</span><span class="cx"> virtual void didReceiveAuthenticationChallenge(WebKit::WebPageProxy&, WebKit::AuthenticationChallengeProxy*) { }
</span><span class="cx">
</span><del>- // FIXME: This function should not be part of this client.
</del><ins>+ // FIXME: These function should not be part of this client.
</ins><span class="cx"> virtual void processDidCrash(WebKit::WebPageProxy&) { }
</span><ins>+ virtual void processDidBecomeResponsive(WebKit::WebPageProxy&) { }
+ virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy&) { }
</ins><span class="cx">
</span><span class="cx"> virtual RefPtr<Data> webCryptoMasterKey(WebKit::WebPageProxy&) { return nullptr; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (191894 => 191895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h        2015-11-02 18:24:49 UTC (rev 191894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h        2015-11-02 18:26:39 UTC (rev 191895)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> - (void)_webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
</span><span class="cx">
</span><span class="cx"> - (void)_webViewWebProcessDidCrash:(WKWebView *)webView;
</span><ins>+- (void)_webViewWebProcessDidBecomeResponsive:(WKWebView *)webView;
+- (void)_webViewWebProcessDidBecomeUnresponsive:(WKWebView *)webView;
</ins><span class="cx">
</span><span class="cx"> - (NSData *)_webCryptoMasterKeyForWebView:(WKWebView *)webView;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (191894 => 191895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2015-11-02 18:24:49 UTC (rev 191894)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2015-11-02 18:26:39 UTC (rev 191895)
</span><span class="lines">@@ -101,6 +101,9 @@
</span><span class="cx"> virtual bool canAuthenticateAgainstProtectionSpace(WebPageProxy&, WebProtectionSpace*) override;
</span><span class="cx"> virtual void didReceiveAuthenticationChallenge(WebPageProxy&, AuthenticationChallengeProxy*) override;
</span><span class="cx"> virtual void processDidCrash(WebPageProxy&) override;
</span><ins>+ virtual void processDidBecomeResponsive(WebPageProxy&) override;
+ virtual void processDidBecomeUnresponsive(WebPageProxy&) override;
+
</ins><span class="cx"> virtual RefPtr<API::Data> webCryptoMasterKey(WebPageProxy&) override;
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="lines">@@ -171,6 +174,8 @@
</span><span class="cx"> bool webViewCanAuthenticateAgainstProtectionSpace : 1;
</span><span class="cx"> bool webViewDidReceiveAuthenticationChallenge : 1;
</span><span class="cx"> bool webViewWebProcessDidCrash : 1;
</span><ins>+ bool webViewWebProcessDidBecomeResponsive : 1;
+ bool webViewWebProcessDidBecomeUnresponsive : 1;
</ins><span class="cx"> bool webCryptoMasterKeyForWebView : 1;
</span><span class="cx"> bool webViewDidBeginNavigationGesture : 1;
</span><span class="cx"> bool webViewWillEndNavigationGestureWithNavigationToBackForwardListItem : 1;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (191894 => 191895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2015-11-02 18:24:49 UTC (rev 191894)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2015-11-02 18:26:39 UTC (rev 191895)
</span><span class="lines">@@ -150,6 +150,8 @@
</span><span class="cx"> m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace = [delegate respondsToSelector:@selector(_webView:canAuthenticateAgainstProtectionSpace:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge = [delegate respondsToSelector:@selector(_webView:didReceiveAuthenticationChallenge:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewWebProcessDidCrash = [delegate respondsToSelector:@selector(_webViewWebProcessDidCrash:)];
</span><ins>+ m_navigationDelegateMethods.webViewWebProcessDidBecomeResponsive = [delegate respondsToSelector:@selector(_webViewWebProcessDidBecomeResponsive:)];
+ m_navigationDelegateMethods.webViewWebProcessDidBecomeUnresponsive = [delegate respondsToSelector:@selector(_webViewWebProcessDidBecomeUnresponsive:)];
</ins><span class="cx"> m_navigationDelegateMethods.webCryptoMasterKeyForWebView = [delegate respondsToSelector:@selector(_webCryptoMasterKeyForWebView:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewDidBeginNavigationGesture = [delegate respondsToSelector:@selector(_webViewDidBeginNavigationGesture:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewWillEndNavigationGestureWithNavigationToBackForwardListItem = [delegate respondsToSelector:@selector(_webViewWillEndNavigationGesture:withNavigationToBackForwardListItem:)];
</span><span class="lines">@@ -683,6 +685,30 @@
</span><span class="cx"> [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webViewWebProcessDidCrash:m_navigationState.m_webView];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationState::NavigationClient::processDidBecomeResponsive(WebKit::WebPageProxy& page)
+{
+ if (!m_navigationState.m_navigationDelegateMethods.webViewWebProcessDidBecomeResponsive)
+ return;
+
+ auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+ if (!navigationDelegate)
+ return;
+
+ [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webViewWebProcessDidBecomeResponsive:m_navigationState.m_webView];
+}
+
+void NavigationState::NavigationClient::processDidBecomeUnresponsive(WebKit::WebPageProxy& page)
+{
+ if (!m_navigationState.m_navigationDelegateMethods.webViewWebProcessDidBecomeUnresponsive)
+ return;
+
+ auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+ if (!navigationDelegate)
+ return;
+
+ [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webViewWebProcessDidBecomeUnresponsive:m_navigationState.m_webView];
+}
+
</ins><span class="cx"> RefPtr<API::Data> NavigationState::NavigationClient::webCryptoMasterKey(WebKit::WebPageProxy&)
</span><span class="cx"> {
</span><span class="cx"> if (!m_navigationState.m_navigationDelegateMethods.webCryptoMasterKeyForWebView)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191894 => 191895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-11-02 18:24:49 UTC (rev 191894)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-11-02 18:26:39 UTC (rev 191895)
</span><span class="lines">@@ -4857,7 +4857,10 @@
</span><span class="cx">
</span><span class="cx"> updateBackingStoreDiscardableState();
</span><span class="cx">
</span><del>- m_loaderClient->processDidBecomeUnresponsive(*this);
</del><ins>+ if (m_navigationClient)
+ m_navigationClient->processDidBecomeUnresponsive(*this);
+ else
+ m_loaderClient->processDidBecomeUnresponsive(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::interactionOccurredWhileProcessUnresponsive()
</span><span class="lines">@@ -4875,7 +4878,10 @@
</span><span class="cx">
</span><span class="cx"> updateBackingStoreDiscardableState();
</span><span class="cx">
</span><del>- m_loaderClient->processDidBecomeResponsive(*this);
</del><ins>+ if (m_navigationClient)
+ m_navigationClient->processDidBecomeResponsive(*this);
+ else
+ m_loaderClient->processDidBecomeResponsive(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::processDidCrash()
</span></span></pre>
</div>
</div>
</body>
</html>