<!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>[191906] 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/191906">191906</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 13:13:22 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused API client callback code
https://bugs.webkit.org/show_bug.cgi?id=150813
Reviewed by Tim Horton.
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::interactionOccurredWhileProcessUnresponsive): Deleted.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient): Deleted.
* UIProcess/ResponsivenessTimer.cpp:
(WebKit::ResponsivenessTimer::timerFired):
* UIProcess/ResponsivenessTimer.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::interactionOccurredWhileProcessUnresponsive): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::interactionOccurredWhileUnresponsive): Deleted.
* UIProcess/WebProcessProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPILoaderClienth">trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</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 (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-11-02 Anders Carlsson <andersca@apple.com>
+
+ Remove unused API client callback code
+ https://bugs.webkit.org/show_bug.cgi?id=150813
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::interactionOccurredWhileProcessUnresponsive): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient): Deleted.
+ * UIProcess/ResponsivenessTimer.cpp:
+ (WebKit::ResponsivenessTimer::timerFired):
+ * UIProcess/ResponsivenessTimer.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::interactionOccurredWhileProcessUnresponsive): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::interactionOccurredWhileUnresponsive): Deleted.
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2015-10-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace iOS-only WebKitSystemInterface calls with SPI
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -84,9 +84,8 @@
</span><span class="cx"> virtual void didChangeProgress(WebKit::WebPageProxy&) { }
</span><span class="cx"> virtual void didFinishProgress(WebKit::WebPageProxy&) { }
</span><span class="cx">
</span><del>- // FIXME: These four functions should not be part of this client.
</del><ins>+ // FIXME: These functions should not be part of this client.
</ins><span class="cx"> virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy&) { }
</span><del>- virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy&) { }
</del><span class="cx"> virtual void processDidBecomeResponsive(WebKit::WebPageProxy&) { }
</span><span class="cx"> virtual void processDidCrash(WebKit::WebPageProxy&) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -1146,14 +1146,6 @@
</span><span class="cx"> m_client.processDidBecomeUnresponsive(toAPI(&page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void interactionOccurredWhileProcessUnresponsive(WebPageProxy& page) override
- {
- if (!m_client.interactionOccurredWhileProcessUnresponsive)
- return;
-
- m_client.interactionOccurredWhileProcessUnresponsive(toAPI(&page), m_client.base.clientInfo);
- }
-
</del><span class="cx"> virtual void processDidBecomeResponsive(WebPageProxy& page) override
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.processDidBecomeResponsive)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -49,13 +49,11 @@
</span><span class="cx">
</span><span class="cx"> void ResponsivenessTimer::timerFired()
</span><span class="cx"> {
</span><del>- if (m_isResponsive) {
- m_isResponsive = false;
- m_client->didBecomeUnresponsive(this);
- } else {
- // The timer fired while unresponsive.
- m_client->interactionOccurredWhileUnresponsive(this);
- }
</del><ins>+ if (!m_isResponsive)
+ return;
+
+ m_isResponsive = false;
+ m_client->didBecomeUnresponsive(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResponsivenessTimer::start()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessResponsivenessTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Client() { }
</span><span class="cx"> virtual void didBecomeUnresponsive(ResponsivenessTimer*) = 0;
</span><del>- virtual void interactionOccurredWhileUnresponsive(ResponsivenessTimer*) = 0;
</del><span class="cx"> virtual void didBecomeResponsive(ResponsivenessTimer*) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -4863,14 +4863,6 @@
</span><span class="cx"> m_loaderClient->processDidBecomeUnresponsive(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::interactionOccurredWhileProcessUnresponsive()
-{
- if (!isValid())
- return;
-
- m_loaderClient->interactionOccurredWhileProcessUnresponsive(*this);
-}
-
</del><span class="cx"> void WebPageProxy::processDidBecomeResponsive()
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -809,7 +809,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void processDidBecomeUnresponsive();
</span><del>- void interactionOccurredWhileProcessUnresponsive();
</del><span class="cx"> void processDidBecomeResponsive();
</span><span class="cx"> void processDidCrash();
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -560,14 +560,6 @@
</span><span class="cx"> pages[i]->processDidBecomeUnresponsive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::interactionOccurredWhileUnresponsive(ResponsivenessTimer*)
-{
- Vector<RefPtr<WebPageProxy>> pages;
- copyValuesToVector(m_pageMap, pages);
- for (size_t i = 0, size = pages.size(); i < size; ++i)
- pages[i]->interactionOccurredWhileProcessUnresponsive();
-}
-
</del><span class="cx"> void WebProcessProxy::didBecomeResponsive(ResponsivenessTimer*)
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebPageProxy>> pages;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (191905 => 191906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-02 21:10:36 UTC (rev 191905)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-02 21:13:22 UTC (rev 191906)
</span><span class="lines">@@ -207,7 +207,6 @@
</span><span class="cx">
</span><span class="cx"> // ResponsivenessTimer::Client
</span><span class="cx"> void didBecomeUnresponsive(ResponsivenessTimer*) override;
</span><del>- void interactionOccurredWhileUnresponsive(ResponsivenessTimer*) override;
</del><span class="cx"> void didBecomeResponsive(ResponsivenessTimer*) override;
</span><span class="cx">
</span><span class="cx"> // ProcessThrottlerClient
</span></span></pre>
</div>
</div>
</body>
</html>