<!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>[191924] 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/191924">191924</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 16:32:25 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add KVO-compliant _webProcessIsResponsive property to WKWebView and _WKObservablePageState
https://bugs.webkit.org/show_bug.cgi?id=150818
rdar://problem/22372131
Reviewed by Tim Horton.
* UIProcess/API/C/mac/WKPagePrivateMac.h:
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
(-[WKObservablePageState _webProcessIsResponsive]):
* UIProcess/API/Cocoa/PageLoadStateObserver.h:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController _webProcessIsResponsive]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _webProcessIsResponsive]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::willChangeWebProcessIsResponsive):
(WebKit::NavigationState::didChangeWebProcessIsResponsive):
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::willChangeProcessIsResponsive):
(WebKit::PageLoadState::didChangeProcessIsResponsive):
* UIProcess/PageLoadState.h:
* UIProcess/ResponsivenessTimer.cpp:
(WebKit::ResponsivenessTimer::ResponsivenessTimer):
(WebKit::ResponsivenessTimer::timerFired):
(WebKit::ResponsivenessTimer::stop):
* UIProcess/ResponsivenessTimer.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::willChangeProcessIsResponsive):
(WebKit::WebPageProxy::didChangeProcessIsResponsive):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::WebProcessProxy):
(WebKit::WebProcessProxy::didBecomeUnresponsive):
(WebKit::WebProcessProxy::didBecomeResponsive):
(WebKit::WebProcessProxy::willChangeIsResponsive):
(WebKit::WebProcessProxy::didChangeIsResponsive):
* UIProcess/WebProcessProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaPageLoadStateObserverh">trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.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="#trunkSourceWebKit2UIProcessPageLoadStatecpp">trunk/Source/WebKit2/UIProcess/PageLoadState.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageLoadStateh">trunk/Source/WebKit2/UIProcess/PageLoadState.h</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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.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 (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-11-02 Anders Carlsson <andersca@apple.com>
+
+ Add KVO-compliant _webProcessIsResponsive property to WKWebView and _WKObservablePageState
+ https://bugs.webkit.org/show_bug.cgi?id=150818
+ rdar://problem/22372131
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+ (-[WKObservablePageState _webProcessIsResponsive]):
+ * UIProcess/API/Cocoa/PageLoadStateObserver.h:
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController _webProcessIsResponsive]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _webProcessIsResponsive]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::willChangeWebProcessIsResponsive):
+ (WebKit::NavigationState::didChangeWebProcessIsResponsive):
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::willChangeProcessIsResponsive):
+ (WebKit::PageLoadState::didChangeProcessIsResponsive):
+ * UIProcess/PageLoadState.h:
+ * UIProcess/ResponsivenessTimer.cpp:
+ (WebKit::ResponsivenessTimer::ResponsivenessTimer):
+ (WebKit::ResponsivenessTimer::timerFired):
+ (WebKit::ResponsivenessTimer::stop):
+ * UIProcess/ResponsivenessTimer.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::willChangeProcessIsResponsive):
+ (WebKit::WebPageProxy::didChangeProcessIsResponsive):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::WebProcessProxy):
+ (WebKit::WebProcessProxy::didBecomeUnresponsive):
+ (WebKit::WebProcessProxy::didBecomeResponsive):
+ (WebKit::WebProcessProxy::willChangeIsResponsive):
+ (WebKit::WebProcessProxy::didChangeIsResponsive):
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2015-11-02 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> PDFPlugin should take advantage of threaded scrolling
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> @property (nonatomic, readonly, getter=isLoading) BOOL loading;
</span><span class="cx"> @property (nonatomic, readonly) double estimatedProgress;
</span><span class="cx"> @property (nonatomic, readonly) BOOL hasOnlySecureContent;
</span><ins>+@property (nonatomic, readonly) BOOL _webProcessIsResponsive;
</ins><span class="cx">
</span><span class="cx"> // Not KVO compliant.
</span><span class="cx"> @property (nonatomic, readonly) NSURL *unreachableURL;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -85,6 +85,11 @@
</span><span class="cx"> return _page->pageLoadState().hasOnlySecureContent();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_webProcessIsResponsive
+{
+ return _page->process().responsivenessTimer()->isResponsive();
+}
+
</ins><span class="cx"> - (double)estimatedProgress
</span><span class="cx"> {
</span><span class="cx"> return _page->estimatedProgress();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaPageLoadStateObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -98,6 +98,16 @@
</span><span class="cx"> virtual void willChangeCertificateInfo() override { }
</span><span class="cx"> virtual void didChangeCertificateInfo() override { }
</span><span class="cx">
</span><ins>+ virtual void willChangeWebProcessIsResponsive() override
+ {
+ [m_object willChangeValueForKey:@"_webProcessIsResponsive"];
+ }
+
+ virtual void didChangeWebProcessIsResponsive() override
+ {
+ [m_object didChangeValueForKey:@"_webProcessIsResponsive"];
+ }
+
</ins><span class="cx"> id m_object;
</span><span class="cx"> RetainPtr<NSString> m_activeURLKey;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -767,6 +767,11 @@
</span><span class="cx"> return _page->processIdentifier();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_webProcessIsResponsive
+{
+ return _page->process().responsivenessTimer()->isResponsive();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -4002,6 +4002,11 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+- (BOOL)_webProcessIsResponsive
+{
+ return _page->process().responsivenessTimer()->isResponsive();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -228,6 +228,8 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, getter=_allowsMediaDocumentInlinePlayback, setter=_setAllowsMediaDocumentInlinePlayback:) BOOL _allowsMediaDocumentInlinePlayback;
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly) BOOL _webProcessIsResponsive WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -150,6 +150,8 @@
</span><span class="cx"> virtual void didChangeNetworkRequestsInProgress() override;
</span><span class="cx"> virtual void willChangeCertificateInfo() override;
</span><span class="cx"> virtual void didChangeCertificateInfo() override;
</span><ins>+ virtual void willChangeWebProcessIsResponsive() override;
+ virtual void didChangeWebProcessIsResponsive() override;
</ins><span class="cx">
</span><span class="cx"> WKWebView *m_webView;
</span><span class="cx"> WeakObjCPtr<id <WKNavigationDelegate> > m_navigationDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -907,6 +907,16 @@
</span><span class="cx"> [m_webView didChangeValueForKey:@"certificateChain"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationState::willChangeWebProcessIsResponsive()
+{
+ [m_webView willChangeValueForKey:@"_webProcessIsResponsive"];
+}
+
+void NavigationState::didChangeWebProcessIsResponsive()
+{
+ [m_webView didChangeValueForKey:@"_webProcessIsResponsive"];
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -402,6 +402,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageLoadState::willChangeProcessIsResponsive()
+{
+}
+
+void PageLoadState::didChangeProcessIsResponsive()
+{
+}
+
</ins><span class="cx"> void PageLoadState::callObserverCallback(void (Observer::*callback)())
</span><span class="cx"> {
</span><span class="cx"> for (auto* observer : m_observers)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void willChangeCertificateInfo() = 0;
</span><span class="cx"> virtual void didChangeCertificateInfo() = 0;
</span><ins>+
+ virtual void willChangeWebProcessIsResponsive() = 0;
+ virtual void didChangeWebProcessIsResponsive() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Transaction {
</span><span class="lines">@@ -162,6 +165,11 @@
</span><span class="cx"> void didFinishProgress(const Transaction::Token&);
</span><span class="cx"> void setNetworkRequestsInProgress(const Transaction::Token&, bool);
</span><span class="cx">
</span><ins>+ // FIXME: We piggy-back off PageLoadState::Observer so that both WKWebView and WKObservablePageState
+ // can listen for changes. Once we get rid of WKObservablePageState these could just be part of API::NavigationClient.
+ void willChangeProcessIsResponsive();
+ void didChangeProcessIsResponsive();
+
</ins><span class="cx"> private:
</span><span class="cx"> void beginTransaction() { ++m_outstandingTransactionCount; }
</span><span class="cx"> void endTransaction();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> static const double responsivenessTimeout = 3;
</span><span class="cx">
</span><del>-ResponsivenessTimer::ResponsivenessTimer(ResponsivenessTimer::Client* client)
</del><ins>+ResponsivenessTimer::ResponsivenessTimer(ResponsivenessTimer::Client& client)
</ins><span class="cx"> : m_client(client)
</span><span class="cx"> , m_isResponsive(true)
</span><span class="cx"> , m_timer(RunLoop::main(), this, &ResponsivenessTimer::timerFired)
</span><span class="lines">@@ -52,8 +52,11 @@
</span><span class="cx"> if (!m_isResponsive)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_client.willChangeIsResponsive();
</ins><span class="cx"> m_isResponsive = false;
</span><del>- m_client->didBecomeUnresponsive(this);
</del><ins>+ m_client.didChangeIsResponsive();
+
+ m_client.didBecomeUnresponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResponsivenessTimer::start()
</span><span class="lines">@@ -67,9 +70,12 @@
</span><span class="cx"> void ResponsivenessTimer::stop()
</span><span class="cx"> {
</span><span class="cx"> if (!m_isResponsive) {
</span><del>- // We got a life sign from the web process!
- m_client->didBecomeResponsive(this);
</del><ins>+ // We got a life sign from the web process.
+ m_client.willChangeIsResponsive();
</ins><span class="cx"> m_isResponsive = true;
</span><ins>+ m_client.didChangeIsResponsive();
+
+ m_client.didBecomeResponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_timer.stop();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -35,11 +35,14 @@
</span><span class="cx"> class Client {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Client() { }
</span><del>- virtual void didBecomeUnresponsive(ResponsivenessTimer*) = 0;
- virtual void didBecomeResponsive(ResponsivenessTimer*) = 0;
</del><ins>+ virtual void didBecomeUnresponsive() = 0;
+ virtual void didBecomeResponsive() = 0;
+
+ virtual void willChangeIsResponsive() = 0;
+ virtual void didChangeIsResponsive() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- explicit ResponsivenessTimer(ResponsivenessTimer::Client*);
</del><ins>+ explicit ResponsivenessTimer(ResponsivenessTimer::Client&);
</ins><span class="cx"> ~ResponsivenessTimer();
</span><span class="cx">
</span><span class="cx"> void start();
</span><span class="lines">@@ -52,7 +55,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void timerFired();
</span><span class="cx">
</span><del>- ResponsivenessTimer::Client* m_client;
</del><ins>+ ResponsivenessTimer::Client& m_client;
</ins><span class="cx"> bool m_isResponsive;
</span><span class="cx">
</span><span class="cx"> RunLoop::Timer<ResponsivenessTimer> m_timer;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -4880,6 +4880,16 @@
</span><span class="cx"> m_loaderClient->processDidBecomeResponsive(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::willChangeProcessIsResponsive()
+{
+ m_pageLoadState.willChangeProcessIsResponsive();
+}
+
+void WebPageProxy::didChangeProcessIsResponsive()
+{
+ m_pageLoadState.didChangeProcessIsResponsive();
+}
+
</ins><span class="cx"> void WebPageProxy::processDidCrash()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isValid);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -811,6 +811,9 @@
</span><span class="cx"> void processDidBecomeUnresponsive();
</span><span class="cx"> void processDidBecomeResponsive();
</span><span class="cx"> void processDidCrash();
</span><ins>+ void willChangeProcessIsResponsive();
+ void didChangeProcessIsResponsive();
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void processWillBecomeSuspended();
</span><span class="cx"> void processWillBecomeForeground();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebProcessProxy::WebProcessProxy(WebProcessPool& processPool)
</span><del>- : m_responsivenessTimer(this)
</del><ins>+ : m_responsivenessTimer(*this)
</ins><span class="cx"> , m_processPool(processPool)
</span><span class="cx"> , m_mayHaveUniversalFileReadSandboxExtension(false)
</span><span class="cx"> , m_customProtocolManagerProxy(this, processPool)
</span><span class="lines">@@ -552,22 +552,38 @@
</span><span class="cx"> didClose(connection);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*)
</del><ins>+void WebProcessProxy::didBecomeUnresponsive()
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebPageProxy>> pages;
</span><span class="cx"> copyValuesToVector(m_pageMap, pages);
</span><del>- for (size_t i = 0, size = pages.size(); i < size; ++i)
- pages[i]->processDidBecomeUnresponsive();
</del><ins>+ for (auto& page : pages)
+ page->processDidBecomeUnresponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::didBecomeResponsive(ResponsivenessTimer*)
</del><ins>+void WebProcessProxy::didBecomeResponsive()
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebPageProxy>> pages;
</span><span class="cx"> copyValuesToVector(m_pageMap, pages);
</span><del>- for (size_t i = 0, size = pages.size(); i < size; ++i)
- pages[i]->processDidBecomeResponsive();
</del><ins>+ for (auto& page : pages)
+ page->processDidBecomeResponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::willChangeIsResponsive()
+{
+ Vector<RefPtr<WebPageProxy>> pages;
+ copyValuesToVector(m_pageMap, pages);
+ for (auto& page : pages)
+ page->willChangeProcessIsResponsive();
+}
+
+void WebProcessProxy::didChangeIsResponsive()
+{
+ Vector<RefPtr<WebPageProxy>> pages;
+ copyValuesToVector(m_pageMap, pages);
+ for (auto& page : pages)
+ page->didChangeProcessIsResponsive();
+}
+
</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 (191923 => 191924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-03 00:25:56 UTC (rev 191923)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-03 00:32:25 UTC (rev 191924)
</span><span class="lines">@@ -206,8 +206,10 @@
</span><span class="cx"> virtual IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Web; }
</span><span class="cx">
</span><span class="cx"> // ResponsivenessTimer::Client
</span><del>- void didBecomeUnresponsive(ResponsivenessTimer*) override;
- void didBecomeResponsive(ResponsivenessTimer*) override;
</del><ins>+ void didBecomeUnresponsive() override;
+ void didBecomeResponsive() override;
+ virtual void willChangeIsResponsive() override;
+ virtual void didChangeIsResponsive() override;
</ins><span class="cx">
</span><span class="cx"> // ProcessThrottlerClient
</span><span class="cx"> void sendProcessWillSuspendImminently() override;
</span></span></pre>
</div>
</div>
</body>
</html>