<!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>[191959] 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/191959">191959</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 10:44:44 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE the responsiveness timer getter
https://bugs.webkit.org/show_bug.cgi?id=150825
Reviewed by Daniel Bates.
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
(-[WKObservablePageState _webProcessIsResponsive]):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController _webProcessIsResponsive]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _webProcessIsResponsive]):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::reattachToWebProcessForReload):
(WebKit::WebPageProxy::reattachToWebProcessWithItem):
(WebKit::WebPageProxy::tryClose):
(WebKit::WebPageProxy::loadRequest):
(WebKit::WebPageProxy::loadFile):
(WebKit::WebPageProxy::loadData):
(WebKit::WebPageProxy::loadHTMLString):
(WebKit::WebPageProxy::loadAlternateHTMLString):
(WebKit::WebPageProxy::loadPlainTextString):
(WebKit::WebPageProxy::loadWebArchiveData):
(WebKit::WebPageProxy::navigateToPDFLinkWithSimulatedClick):
(WebKit::WebPageProxy::stopLoading):
(WebKit::WebPageProxy::reload):
(WebKit::WebPageProxy::goForward):
(WebKit::WebPageProxy::goBack):
(WebKit::WebPageProxy::goToBackForwardItem):
(WebKit::WebPageProxy::dispatchViewStateChange):
(WebKit::WebPageProxy::handleMouseEvent):
(WebKit::WebPageProxy::sendWheelEvent):
(WebKit::WebPageProxy::handleKeyboardEvent):
(WebKit::WebPageProxy::handleGestureEvent):
(WebKit::WebPageProxy::handleTouchEventSynchronously):
(WebKit::WebPageProxy::handleTouchEvent):
(WebKit::WebPageProxy::closePage):
(WebKit::WebPageProxy::runJavaScriptAlert):
(WebKit::WebPageProxy::runJavaScriptConfirm):
(WebKit::WebPageProxy::runJavaScriptPrompt):
(WebKit::WebPageProxy::runBeforeUnloadConfirmPanel):
(WebKit::WebPageProxy::runOpenPanel):
(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::stopResponsivenessTimer):
(WebKit::WebPageProxy::runModal):
(WebKit::WebPageProxy::updateBackingStoreDiscardableState):
* UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::responsivenessTimer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm</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="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.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 (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2015-11-02 Anders Carlsson <andersca@apple.com>
+
+ CTTE the responsiveness timer getter
+ https://bugs.webkit.org/show_bug.cgi?id=150825
+
+ Reviewed by Daniel Bates.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+ (-[WKObservablePageState _webProcessIsResponsive]):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController _webProcessIsResponsive]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _webProcessIsResponsive]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::reattachToWebProcessForReload):
+ (WebKit::WebPageProxy::reattachToWebProcessWithItem):
+ (WebKit::WebPageProxy::tryClose):
+ (WebKit::WebPageProxy::loadRequest):
+ (WebKit::WebPageProxy::loadFile):
+ (WebKit::WebPageProxy::loadData):
+ (WebKit::WebPageProxy::loadHTMLString):
+ (WebKit::WebPageProxy::loadAlternateHTMLString):
+ (WebKit::WebPageProxy::loadPlainTextString):
+ (WebKit::WebPageProxy::loadWebArchiveData):
+ (WebKit::WebPageProxy::navigateToPDFLinkWithSimulatedClick):
+ (WebKit::WebPageProxy::stopLoading):
+ (WebKit::WebPageProxy::reload):
+ (WebKit::WebPageProxy::goForward):
+ (WebKit::WebPageProxy::goBack):
+ (WebKit::WebPageProxy::goToBackForwardItem):
+ (WebKit::WebPageProxy::dispatchViewStateChange):
+ (WebKit::WebPageProxy::handleMouseEvent):
+ (WebKit::WebPageProxy::sendWheelEvent):
+ (WebKit::WebPageProxy::handleKeyboardEvent):
+ (WebKit::WebPageProxy::handleGestureEvent):
+ (WebKit::WebPageProxy::handleTouchEventSynchronously):
+ (WebKit::WebPageProxy::handleTouchEvent):
+ (WebKit::WebPageProxy::closePage):
+ (WebKit::WebPageProxy::runJavaScriptAlert):
+ (WebKit::WebPageProxy::runJavaScriptConfirm):
+ (WebKit::WebPageProxy::runJavaScriptPrompt):
+ (WebKit::WebPageProxy::runBeforeUnloadConfirmPanel):
+ (WebKit::WebPageProxy::runOpenPanel):
+ (WebKit::WebPageProxy::showPopupMenu):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ (WebKit::WebPageProxy::didReceiveEvent):
+ (WebKit::WebPageProxy::stopResponsivenessTimer):
+ (WebKit::WebPageProxy::runModal):
+ (WebKit::WebPageProxy::updateBackingStoreDiscardableState):
+ * UIProcess/WebProcessProxy.h:
+ (WebKit::WebProcessProxy::responsivenessTimer):
+
</ins><span class="cx"> 2015-11-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.11.1 release.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_webProcessIsResponsive
</span><span class="cx"> {
</span><del>- return _page->process().responsivenessTimer()->isResponsive();
</del><ins>+ return _page->process().responsivenessTimer().isResponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)estimatedProgress
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_webProcessIsResponsive
</span><span class="cx"> {
</span><del>- return _page->process().responsivenessTimer()->isResponsive();
</del><ins>+ return _page->process().responsivenessTimer().isResponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -4004,7 +4004,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_webProcessIsResponsive
</span><span class="cx"> {
</span><del>- return _page->process().responsivenessTimer()->isResponsive();
</del><ins>+ return _page->process().responsivenessTimer().isResponsive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> m_isWaitingForDidUpdateBackingStoreState = false;
</span><span class="cx">
</span><span class="cx"> // Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
</span><del>- m_webPageProxy.process().responsivenessTimer()->stop();
</del><ins>+ m_webPageProxy.process().responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> if (layerTreeContext != m_layerTreeContext) {
</span><span class="cx"> if (!m_layerTreeContext.isEmpty()) {
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState) {
</span><span class="cx"> // Start the responsiveness timer. We will stop it when we hear back from the WebProcess
</span><span class="cx"> // in didUpdateBackingStoreState.
</span><del>- m_webPageProxy.process().responsivenessTimer()->start();
</del><ins>+ m_webPageProxy.process().responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState && !m_layerTreeContext.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> m_isWaitingForDidUpdateBackingStoreState = false;
</span><span class="cx">
</span><span class="cx"> // Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
</span><del>- m_webPageProxy.process().responsivenessTimer()->stop();
</del><ins>+ m_webPageProxy.process().responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> if (layerTreeContext != m_layerTreeContext) {
</span><span class="cx"> if (!m_layerTreeContext.isEmpty()) {
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState) {
</span><span class="cx"> // Start the responsiveness timer. We will stop it when we hear back from the WebProcess
</span><span class="cx"> // in didUpdateBackingStoreState.
</span><del>- m_webPageProxy.process().responsivenessTimer()->start();
</del><ins>+ m_webPageProxy.process().responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_isWaitingForDidUpdateBackingStoreState && !m_layerTreeContext.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx">
</span><span class="cx"> // We allow stale content when reloading a WebProcess that's been killed or crashed.
</span><span class="cx"> m_process->send(Messages::WebPage::GoToBackForwardItem(navigation->navigationID(), m_backForwardList->currentItem()->itemID()), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -762,7 +762,7 @@
</span><span class="cx"> auto navigation = m_navigationState->createBackForwardNavigation();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoToBackForwardItem(navigation->navigationID(), item->itemID()), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::TryClose(), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> if (createdExtension)
</span><span class="cx"> m_process->willAcquireUniversalFileReadSandboxExtension();
</span><span class="cx"> m_process->send(Messages::WebPage::LoadRequest(navigation->navigationID(), request, sandboxExtensionHandle, (uint64_t)shouldOpenExternalURLsPolicy, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx"> SandboxExtension::createHandle(resourceDirectoryPath, SandboxExtension::ReadOnly, sandboxExtensionHandle);
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(resourceDirectoryURL);
</span><span class="cx"> m_process->send(Messages::WebPage::LoadRequest(navigation->navigationID(), fileURL, sandboxExtensionHandle, (uint64_t)ShouldOpenExternalURLsPolicy::ShouldNotAllow, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><span class="cx"> m_process->send(Messages::WebPage::LoadData(navigation->navigationID(), data->dataReference(), MIMEType, encoding, baseURL, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -982,7 +982,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><span class="cx"> m_process->send(Messages::WebPage::LoadHTMLString(navigation->navigationID(), htmlString, baseURL, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -1005,7 +1005,7 @@
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(unreachableURL);
</span><span class="cx"> m_process->send(Messages::WebPage::LoadAlternateHTMLString(htmlString, baseURL, unreachableURL, m_failingProvisionalLoadURL, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::loadPlainTextString(const String& string, API::Object* userData)
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::LoadPlainTextString(string, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::loadWebArchiveData(API::Data* webArchiveData, API::Object* userData)
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::LoadWebArchiveData(webArchiveData->dataReference(), UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::navigateToPDFLinkWithSimulatedClick(const String& url, IntPoint documentPoint, IntPoint screenPoint)
</span><span class="lines">@@ -1044,7 +1044,7 @@
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::NavigateToPDFLinkWithSimulatedClick(url, documentPoint, screenPoint), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::stopLoading()
</span><span class="lines">@@ -1053,7 +1053,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::StopLoading(), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Navigation> WebPageProxy::reload(bool reloadFromOrigin, bool contentBlockersEnabled)
</span><span class="lines">@@ -1077,7 +1077,7 @@
</span><span class="cx"> auto navigation = m_navigationState->createReloadNavigation();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::Reload(navigation->navigationID(), reloadFromOrigin, contentBlockersEnabled, sandboxExtensionHandle), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> navigation = m_navigationState->createBackForwardNavigation();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoForward(navigation ? navigation->navigationID() : 0, forwardItem->itemID()), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="lines">@@ -1141,7 +1141,7 @@
</span><span class="cx"> navigation = m_navigationState->createBackForwardNavigation();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoBack(navigation ? navigation->navigationID() : 0, backItem->itemID()), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="lines">@@ -1160,7 +1160,7 @@
</span><span class="cx"> navigation = m_navigationState->createBackForwardNavigation();
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoToBackForwardItem(navigation ? navigation->navigationID() : 0, item->itemID()), m_pageID);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="lines">@@ -1437,7 +1437,7 @@
</span><span class="cx"> // state, it might not send back a reply (since it won't paint anything if the web page is hidden) so we
</span><span class="cx"> // stop the unresponsiveness timer here.
</span><span class="cx"> if ((changed & ViewState::IsVisible) && !isViewVisible())
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> if (changed & ViewState::IsInWindow) {
</span><span class="cx"> if (isInWindow())
</span><span class="lines">@@ -1677,7 +1677,7 @@
</span><span class="cx">
</span><span class="cx"> // NOTE: This does not start the responsiveness timer because mouse move should not indicate interaction.
</span><span class="cx"> if (event.type() != WebEvent::MouseMove)
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> else {
</span><span class="cx"> if (m_processingMouseMoveEvent) {
</span><span class="cx"> m_nextMouseMoveEvent = std::make_unique<NativeWebMouseEvent>(event);
</span><span class="lines">@@ -1799,7 +1799,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::sendWheelEvent(const WebWheelEvent& event)
</span><span class="cx"> {
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> m_process->send(
</span><span class="cx"> Messages::EventDispatcher::WheelEvent(
</span><span class="lines">@@ -1821,7 +1821,7 @@
</span><span class="cx">
</span><span class="cx"> m_keyEventQueue.append(event);
</span><span class="cx">
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> if (m_keyEventQueue.size() == 1) // Otherwise, sent from DidReceiveEvent message handler.
</span><span class="cx"> m_process->send(Messages::WebPage::KeyEvent(event), m_pageID);
</span><span class="cx"> }
</span><span class="lines">@@ -1916,7 +1916,7 @@
</span><span class="cx">
</span><span class="cx"> m_gestureEventQueue.append(event);
</span><span class="cx"> // FIXME: Consider doing some coalescing here.
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx">
</span><span class="cx"> m_process->send(Messages::EventDispatcher::GestureEvent(m_pageID, event), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -1936,12 +1936,12 @@
</span><span class="cx"> if (!m_isTrackingTouchEvents)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> bool handled = false;
</span><span class="cx"> m_process->sendSync(Messages::WebPage::TouchEventSync(event), Messages::WebPage::TouchEventSync::Reply(handled), m_pageID);
</span><span class="cx"> didReceiveEvent(event.type(), handled);
</span><span class="cx"> m_pageClient.doneWithTouchEvent(event, handled);
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> if (event.allTouchPointsAreReleased())
</span><span class="cx"> m_isTrackingTouchEvents = false;
</span><span class="lines">@@ -1978,7 +1978,7 @@
</span><span class="cx"> // we do not send any of the events to the page even if is has listeners.
</span><span class="cx"> if (!m_isPageSuspended) {
</span><span class="cx"> m_touchEventQueue.append(event);
</span><del>- m_process->responsivenessTimer()->start();
</del><ins>+ m_process->responsivenessTimer().start();
</ins><span class="cx"> m_process->send(Messages::WebPage::TouchEvent(event), m_pageID);
</span><span class="cx"> } else {
</span><span class="cx"> if (m_touchEventQueue.isEmpty()) {
</span><span class="lines">@@ -3537,7 +3537,7 @@
</span><span class="cx"> void WebPageProxy::closePage(bool stopResponsivenessTimer)
</span><span class="cx"> {
</span><span class="cx"> if (stopResponsivenessTimer)
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> m_pageClient.clearAllEditCommands();
</span><span class="cx"> m_uiClient->close(this);
</span><span class="lines">@@ -3549,7 +3549,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> // Since runJavaScriptAlert() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> m_uiClient->runJavaScriptAlert(this, message, frame, securityOrigin, [reply]{ reply->send(); });
</span><span class="cx"> }
</span><span class="lines">@@ -3560,7 +3560,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> // Since runJavaScriptConfirm() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> m_uiClient->runJavaScriptConfirm(this, message, frame, securityOrigin, [reply](bool result) { reply->send(result); });
</span><span class="cx"> }
</span><span class="lines">@@ -3571,7 +3571,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> // Since runJavaScriptPrompt() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, securityOrigin, [reply](const String& result) { reply->send(result); });
</span><span class="cx"> }
</span><span class="lines">@@ -3733,7 +3733,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> shouldClose = m_uiClient->runBeforeUnloadConfirmPanel(this, message, frame);
</span><span class="cx"> }
</span><span class="lines">@@ -3787,7 +3787,7 @@
</span><span class="cx"> m_openPanelResultListener = WebOpenPanelResultListenerProxy::create(this);
</span><span class="cx">
</span><span class="cx"> // Since runOpenPanel() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> if (!m_uiClient->runOpenPanel(this, frame, parameters.get(), m_openPanelResultListener.get())) {
</span><span class="cx"> if (!m_pageClient.handleRunOpenPanel(this, frame, parameters.get(), m_openPanelResultListener.get()))
</span><span class="lines">@@ -4154,7 +4154,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Since showPopupMenu() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> UNUSED_PARAM(data);
</span><span class="lines">@@ -4202,7 +4202,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Since showContextMenu() can spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> m_activeContextMenu->show();
</span><span class="cx"> }
</span><span class="lines">@@ -4525,7 +4525,7 @@
</span><span class="cx"> case WebEvent::GestureChange:
</span><span class="cx"> case WebEvent::GestureEnd:
</span><span class="cx"> #endif
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4638,7 +4638,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::stopResponsivenessTimer()
</span><span class="cx"> {
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::voidCallback(uint64_t callbackID)
</span><span class="lines">@@ -5331,7 +5331,7 @@
</span><span class="cx"> void WebPageProxy::runModal()
</span><span class="cx"> {
</span><span class="cx"> // Since runModal() can (and probably will) spin a nested run loop we need to turn off the responsiveness timer.
</span><del>- m_process->responsivenessTimer()->stop();
</del><ins>+ m_process->responsivenessTimer().stop();
</ins><span class="cx">
</span><span class="cx"> // Our Connection's run loop might have more messages waiting to be handled after this RunModal message.
</span><span class="cx"> // To make sure they are handled inside of the the nested modal run loop we must first signal the Connection's
</span><span class="lines">@@ -5521,7 +5521,7 @@
</span><span class="cx">
</span><span class="cx"> bool isDiscardable;
</span><span class="cx">
</span><del>- if (!m_process->responsivenessTimer()->isResponsive())
</del><ins>+ if (!m_process->responsivenessTimer().isResponsive())
</ins><span class="cx"> isDiscardable = false;
</span><span class="cx"> else
</span><span class="cx"> isDiscardable = !m_pageClient.isViewWindowActive() || !isViewVisible();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (191958 => 191959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-03 18:32:09 UTC (rev 191958)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-03 18:44:44 UTC (rev 191959)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> WebBackForwardListItem* webBackForwardItem(uint64_t itemID) const;
</span><span class="cx">
</span><del>- ResponsivenessTimer* responsivenessTimer() { return &m_responsivenessTimer; }
</del><ins>+ ResponsivenessTimer& responsivenessTimer() { return m_responsivenessTimer; }
</ins><span class="cx">
</span><span class="cx"> WebFrameProxy* webFrame(uint64_t) const;
</span><span class="cx"> bool canCreateFrame(uint64_t frameID) const;
</span></span></pre>
</div>
</div>
</body>
</html>