<!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>[189109] trunk</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/189109">189109</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 11:37:50 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add navigation gesture callbacks to WKPageNavigationClient
https://bugs.webkit.org/show_bug.cgi?id=148568
<rdar://problem/22371346>
Reviewed by Anders Carlsson.
* UIProcess/API/APINavigationClient.h:
(API::NavigationClient::didBeginNavigationGesture):
(API::NavigationClient::willEndNavigationGesture):
(API::NavigationClient::didEndNavigationGesture):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageNavigationClient):
* UIProcess/API/C/WKPageNavigationClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::navigationGestureDidBegin):
(WebKit::WebPageProxy::navigationGestureWillEnd):
(WebKit::WebPageProxy::navigationGestureDidEnd):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createOtherPage):
(WTR::TestController::createWebViewWithOptions):
Add some zeroes.</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="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageNavigationClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageNavigationClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-08-28 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Add navigation gesture callbacks to WKPageNavigationClient
+ https://bugs.webkit.org/show_bug.cgi?id=148568
+ <rdar://problem/22371346>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/APINavigationClient.h:
+ (API::NavigationClient::didBeginNavigationGesture):
+ (API::NavigationClient::willEndNavigationGesture):
+ (API::NavigationClient::didEndNavigationGesture):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageNavigationClient):
+ * UIProcess/API/C/WKPageNavigationClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::navigationGestureDidBegin):
+ (WebKit::WebPageProxy::navigationGestureWillEnd):
+ (WebKit::WebPageProxy::navigationGestureDidEnd):
+
+2015-08-28 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Get rid of the DynamicSizeWithMinimumViewSize layout mode
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148554
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPINavigationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -107,6 +107,10 @@
</span><span class="cx"> return currentPluginLoadPolicy;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
+ virtual void didBeginNavigationGesture(WebKit::WebPageProxy&) { }
+ virtual void willEndNavigationGesture(WebKit::WebPageProxy&, bool willNavigate, WebKit::WebBackForwardListItem&) { }
+ virtual void didEndNavigationGesture(WebKit::WebPageProxy&, bool willNavigate, WebKit::WebBackForwardListItem&) { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -2102,6 +2102,27 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(&page), m_client.base.clientInfo)));
</span><span class="cx"> }
</span><ins>+
+ virtual void didBeginNavigationGesture(WebPageProxy& page) override
+ {
+ if (!m_client.didBeginNavigationGesture)
+ return;
+ m_client.didBeginNavigationGesture(toAPI(&page), m_client.base.clientInfo);
+ }
+
+ virtual void didEndNavigationGesture(WebPageProxy& page, bool willNavigate, WebKit::WebBackForwardListItem& item) override
+ {
+ if (!m_client.didEndNavigationGesture)
+ return;
+ m_client.didEndNavigationGesture(toAPI(&page), willNavigate ? toAPI(&item) : nullptr, m_client.base.clientInfo);
+ }
+
+ virtual void willEndNavigationGesture(WebPageProxy& page, bool willNavigate, WebKit::WebBackForwardListItem& item) override
+ {
+ if (!m_client.willEndNavigationGesture)
+ return;
+ m_client.willEndNavigationGesture(toAPI(&page), willNavigate ? toAPI(&item) : nullptr, m_client.base.clientInfo);
+ }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> virtual PluginModuleLoadPolicy decidePolicyForPluginLoad(WebPageProxy& page, PluginModuleLoadPolicy currentPluginLoadPolicy, API::Dictionary* pluginInformation, String& unavailabilityDescription) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageNavigationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageNavigationClient.h (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageNavigationClient.h 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageNavigationClient.h 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -69,6 +69,12 @@
</span><span class="cx">
</span><span class="cx"> typedef WKPluginLoadPolicy (*WKPageNavigationDecidePolicyForPluginLoadCallback)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, WKStringRef* unavailabilityDescription, const void* clientInfo);
</span><span class="cx">
</span><ins>+typedef void (*WKPageNavigationDidBeginNavigationGesture)(WKPageRef page, const void* clientInfo);
+
+typedef void (*WKPageNavigationWillEndNavigationGesture)(WKPageRef page, WKBackForwardListItemRef backForwardListItem, const void* clientInfo);
+
+typedef void (*WKPageNavigationDidEndNavigationGesture)(WKPageRef page, WKBackForwardListItemRef backForwardListItem, const void* clientInfo);
+
</ins><span class="cx"> typedef struct WKPageNavigationClientBase {
</span><span class="cx"> int version;
</span><span class="cx"> const void* clientInfo;
</span><span class="lines">@@ -95,9 +101,12 @@
</span><span class="cx"> WKPageNavigationDidReceiveAuthenticationChallengeCallback didReceiveAuthenticationChallenge;
</span><span class="cx"> WKPageNavigationWebProcessDidCrashCallback webProcessDidCrash;
</span><span class="cx"> WKPageNavigationCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
</span><ins>+
+ WKPageNavigationDidBeginNavigationGesture didBeginNavigationGesture;
+ WKPageNavigationWillEndNavigationGesture willEndNavigationGesture;
+ WKPageNavigationDidEndNavigationGesture didEndNavigationGesture;
</ins><span class="cx"> } WKPageNavigationClientV0;
</span><span class="cx">
</span><del>-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -5873,7 +5873,11 @@
</span><span class="cx">
</span><span class="cx"> m_isShowingNavigationGestureSnapshot = true;
</span><span class="cx"> m_pageClient.navigationGestureDidBegin();
</span><del>- m_loaderClient->navigationGestureDidBegin(*this);
</del><ins>+
+ if (m_navigationClient)
+ m_navigationClient->didBeginNavigationGesture(*this);
+ else
+ m_loaderClient->navigationGestureDidBegin(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem& item)
</span><span class="lines">@@ -5881,7 +5885,11 @@
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="cx"> m_pageClient.navigationGestureWillEnd(willNavigate, item);
</span><del>- m_loaderClient->navigationGestureWillEnd(*this, willNavigate, item);
</del><ins>+
+ if (m_navigationClient)
+ m_navigationClient->willEndNavigationGesture(*this, willNavigate, item);
+ else
+ m_loaderClient->navigationGestureWillEnd(*this, willNavigate, item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem& item)
</span><span class="lines">@@ -5889,7 +5897,10 @@
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="cx"> m_pageClient.navigationGestureDidEnd(willNavigate, item);
</span><del>- m_loaderClient->navigationGestureDidEnd(*this, willNavigate, item);
</del><ins>+ if (m_navigationClient)
+ m_navigationClient->didEndNavigationGesture(*this, willNavigate, item);
+ else
+ m_loaderClient->navigationGestureDidEnd(*this, willNavigate, item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::navigationGestureDidEnd()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Tools/ChangeLog 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-28 Tim Horton <timothy_horton@apple.com>
+
+ Add navigation gesture callbacks to WKPageNavigationClient
+ https://bugs.webkit.org/show_bug.cgi?id=148568
+ <rdar://problem/22371346>
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+ Add some zeroes.
+
</ins><span class="cx"> 2015-08-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] kill-old-processes should kill more processes
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (189108 => 189109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-28 18:35:48 UTC (rev 189108)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-28 18:37:50 UTC (rev 189109)
</span><span class="lines">@@ -291,6 +291,9 @@
</span><span class="cx"> didReceiveAuthenticationChallenge,
</span><span class="cx"> processDidCrash,
</span><span class="cx"> copyWebCryptoMasterKey,
</span><ins>+ 0, // didBeginNavigationGesture
+ 0, // willEndNavigationGesture
+ 0, // didEndNavigationGesture
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageNavigationClient(newPage, &pageNavigationClient.base);
</span><span class="cx">
</span><span class="lines">@@ -532,6 +535,9 @@
</span><span class="cx"> didReceiveAuthenticationChallenge,
</span><span class="cx"> processDidCrash,
</span><span class="cx"> copyWebCryptoMasterKey,
</span><ins>+ 0, // didBeginNavigationGesture
+ 0, // willEndNavigationGesture
+ 0, // didEndNavigationGesture
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageNavigationClient(m_mainWebView->page(), &pageNavigationClient.base);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>