<!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>[189274] 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/189274">189274</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-09-02 22:51:22 -0700 (Wed, 02 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a modern API way to know that the navigation gesture snapshot was removed, for WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=148693
Reviewed by Anders Carlsson.
* UIProcess/API/APINavigationClient.h:
(API::NavigationClient::didRemoveNavigationGestureSnapshot):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageNavigationClient):
* UIProcess/API/C/WKPageNavigationClient.h:
* UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::setNavigationDelegate):
(WebKit::NavigationState::navigationGestureSnapshotWasRemoved):
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::navigationGestureDidEnd):
(WebKit::WebPageProxy::navigationGestureSnapshotWasRemoved):
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::didRemoveNavigationGestureSnapshot):
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::didRemoveNavigationGestureSnapshot):
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::didRemoveNavigationGestureSnapshot):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/CoordinatedGraphics/WebView.h:
Add a callback for WKTR when the swipe snapshot is removed.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createOtherPage):
(WTR::TestController::createWebViewWithOptions):</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="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.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="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</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 (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-09-02 Tim Horton <timothy_horton@apple.com>
+
+ Add a modern API way to know that the navigation gesture snapshot was removed, for WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=148693
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/APINavigationClient.h:
+ (API::NavigationClient::didRemoveNavigationGestureSnapshot):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageNavigationClient):
+ * UIProcess/API/C/WKPageNavigationClient.h:
+ * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::setNavigationDelegate):
+ (WebKit::NavigationState::navigationGestureSnapshotWasRemoved):
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::navigationGestureDidEnd):
+ (WebKit::WebPageProxy::navigationGestureSnapshotWasRemoved):
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::didRemoveNavigationGestureSnapshot):
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didRemoveNavigationGestureSnapshot):
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::didRemoveNavigationGestureSnapshot):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ Add a callback for WKTR when the swipe snapshot is removed.
+
</ins><span class="cx"> 2015-09-02 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> ScrollbarThemes should be returned by reference.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPINavigationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> virtual void didBeginNavigationGesture(WebKit::WebPageProxy&) { }
</span><span class="cx"> virtual void willEndNavigationGesture(WebKit::WebPageProxy&, bool willNavigate, WebKit::WebBackForwardListItem&) { }
</span><span class="cx"> virtual void didEndNavigationGesture(WebKit::WebPageProxy&, bool willNavigate, WebKit::WebBackForwardListItem&) { }
</span><ins>+ virtual void didRemoveNavigationGestureSnapshot(WebKit::WebPageProxy&) { }
</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 (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -2123,6 +2123,13 @@
</span><span class="cx"> return;
</span><span class="cx"> m_client.willEndNavigationGesture(toAPI(&page), willNavigate ? toAPI(&item) : nullptr, m_client.base.clientInfo);
</span><span class="cx"> }
</span><ins>+
+ virtual void didRemoveNavigationGestureSnapshot(WebPageProxy& page) override
+ {
+ if (!m_client.didRemoveNavigationGestureSnapshot)
+ return;
+ m_client.didRemoveNavigationGestureSnapshot(toAPI(&page), 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 (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageNavigationClient.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageNavigationClient.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx">
</span><span class="cx"> typedef void (*WKPageNavigationDidEndNavigationGesture)(WKPageRef page, WKBackForwardListItemRef backForwardListItem, const void* clientInfo);
</span><span class="cx">
</span><ins>+typedef void (*WKPageNavigationDidRemoveNavigationGestureSnapshot)(WKPageRef page, 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">@@ -105,6 +108,7 @@
</span><span class="cx"> WKPageNavigationDidBeginNavigationGesture didBeginNavigationGesture;
</span><span class="cx"> WKPageNavigationWillEndNavigationGesture willEndNavigationGesture;
</span><span class="cx"> WKPageNavigationDidEndNavigationGesture didEndNavigationGesture;
</span><ins>+ WKPageNavigationDidRemoveNavigationGestureSnapshot didRemoveNavigationGestureSnapshot;
</ins><span class="cx"> } WKPageNavigationClientV0;
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> // Only called if how the gesture will end (with or without navigation) is known before it ends.
</span><span class="cx"> - (void)_webViewWillEndNavigationGesture:(WKWebView *)webView withNavigationToBackForwardListItem:(WKBackForwardListItem *)item;
</span><span class="cx"> - (void)_webView:(WKWebView *)webView willSnapshotBackForwardListItem:(WKBackForwardListItem *)item;
</span><ins>+- (void)_webViewDidRemoveNavigationGestureSnapshot:(WKWebView *)webView;
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> - (void)_webView:(WKWebView *)webView didStartLoadForQuickLookDocumentInMainFrameWithFileName:(NSString *)fileName uti:(NSString *)uti;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -402,6 +402,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::didRemoveNavigationGestureSnapshot()
+{
+}
+
</ins><span class="cx"> void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> virtual void navigationGestureDidEnd(bool, WebBackForwardListItem&) override;
</span><span class="cx"> virtual void navigationGestureDidEnd() override;
</span><span class="cx"> virtual void willRecordNavigationSnapshot(WebBackForwardListItem&) override;
</span><ins>+ virtual void didRemoveNavigationGestureSnapshot() override;
</ins><span class="cx">
</span><span class="cx"> virtual void didFirstVisuallyNonEmptyLayoutForMainFrame() override;
</span><span class="cx"> virtual void didFinishLoadForMainFrame() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&);
</span><span class="cx"> void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&);
</span><span class="cx"> void willRecordNavigationSnapshot(WebBackForwardListItem&);
</span><ins>+ void navigationGestureSnapshotWasRemoved();
</ins><span class="cx">
</span><span class="cx"> void didFirstPaint();
</span><span class="cx">
</span><span class="lines">@@ -172,6 +173,7 @@
</span><span class="cx"> bool webViewWillEndNavigationGestureWithNavigationToBackForwardListItem : 1;
</span><span class="cx"> bool webViewDidEndNavigationGestureWithNavigationToBackForwardListItem : 1;
</span><span class="cx"> bool webViewWillSnapshotBackForwardListItem : 1;
</span><ins>+ bool webViewNavigationGestureSnapshotWasRemoved : 1;
</ins><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> bool webViewDidStartLoadForQuickLookDocumentInMainFrame : 1;
</span><span class="cx"> bool webViewDidFinishLoadForQuickLookDocumentInMainFrame : 1;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> m_navigationDelegateMethods.webViewWillEndNavigationGestureWithNavigationToBackForwardListItem = [delegate respondsToSelector:@selector(_webViewWillEndNavigationGesture:withNavigationToBackForwardListItem:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewDidEndNavigationGestureWithNavigationToBackForwardListItem = [delegate respondsToSelector:@selector(_webViewDidEndNavigationGesture:withNavigationToBackForwardListItem:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewWillSnapshotBackForwardListItem = [delegate respondsToSelector:@selector(_webView:willSnapshotBackForwardListItem:)];
</span><ins>+ m_navigationDelegateMethods.webViewNavigationGestureSnapshotWasRemoved = [delegate respondsToSelector:@selector(_webViewDidRemoveNavigationGestureSnapshot:)];
</ins><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> m_navigationDelegateMethods.webViewDidStartLoadForQuickLookDocumentInMainFrame = [delegate respondsToSelector:@selector(_webView:didStartLoadForQuickLookDocumentInMainFrameWithFileName:uti:)];
</span><span class="cx"> m_navigationDelegateMethods.webViewDidFinishLoadForQuickLookDocumentInMainFrame = [delegate respondsToSelector:@selector(_webView:didFinishLoadForQuickLookDocumentInMainFrame:)];
</span><span class="lines">@@ -224,6 +225,18 @@
</span><span class="cx"> [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate) _webView:m_webView willSnapshotBackForwardListItem:wrapper(item)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationState::navigationGestureSnapshotWasRemoved()
+{
+ if (!m_navigationDelegateMethods.webViewNavigationGestureSnapshotWasRemoved)
+ return;
+
+ auto navigationDelegate = m_navigationDelegate.get();
+ if (!navigationDelegate)
+ return;
+
+ [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate) _webViewDidRemoveNavigationGestureSnapshot:m_webView];
+}
+
</ins><span class="cx"> void NavigationState::didFirstPaint()
</span><span class="cx"> {
</span><span class="cx"> if (!m_navigationDelegateMethods.webViewRenderingProgressDidChange)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -200,11 +200,12 @@
</span><span class="cx"> virtual void beganEnterFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) override { }
</span><span class="cx"> virtual void beganExitFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) override { }
</span><span class="cx"> #endif
</span><del>- virtual void navigationGestureDidBegin() override { };
- virtual void navigationGestureWillEnd(bool, WebBackForwardListItem&) override { };
- virtual void navigationGestureDidEnd(bool, WebBackForwardListItem&) override { };
- virtual void navigationGestureDidEnd() override { };
- virtual void willRecordNavigationSnapshot(WebBackForwardListItem&) override { };
</del><ins>+ virtual void navigationGestureDidBegin() override { }
+ virtual void navigationGestureWillEnd(bool, WebBackForwardListItem&) override { }
+ virtual void navigationGestureDidEnd(bool, WebBackForwardListItem&) override { }
+ virtual void navigationGestureDidEnd() override { }
+ virtual void willRecordNavigationSnapshot(WebBackForwardListItem&) override { }
+ virtual void didRemoveNavigationGestureSnapshot() override { }
</ins><span class="cx">
</span><span class="cx"> virtual void didChangeBackgroundColor() override { }
</span><span class="cx"> virtual void didFailLoadForMainFrame() override { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -321,6 +321,7 @@
</span><span class="cx"> virtual void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) = 0;
</span><span class="cx"> virtual void navigationGestureDidEnd() = 0;
</span><span class="cx"> virtual void willRecordNavigationSnapshot(WebBackForwardListItem&) = 0;
</span><ins>+ virtual void didRemoveNavigationGestureSnapshot() = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void didFirstVisuallyNonEmptyLayoutForMainFrame() = 0;
</span><span class="cx"> virtual void didFinishLoadForMainFrame() = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -5897,6 +5897,7 @@
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="cx"> m_pageClient.navigationGestureDidEnd(willNavigate, item);
</span><ins>+
</ins><span class="cx"> if (m_navigationClient)
</span><span class="cx"> m_navigationClient->didEndNavigationGesture(*this, willNavigate, item);
</span><span class="cx"> else
</span><span class="lines">@@ -5920,6 +5921,11 @@
</span><span class="cx"> void WebPageProxy::navigationGestureSnapshotWasRemoved()
</span><span class="cx"> {
</span><span class="cx"> m_isShowingNavigationGestureSnapshot = false;
</span><ins>+
+ m_pageClient.didRemoveNavigationGestureSnapshot();
+
+ if (m_navigationClient)
+ m_navigationClient->didRemoveNavigationGestureSnapshot(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::isPlayingMediaDidChange(MediaProducer::MediaStateFlags state, uint64_t sourceElementID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx"> virtual void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
</span><span class="cx"> virtual void navigationGestureDidEnd() override;
</span><span class="cx"> virtual void willRecordNavigationSnapshot(WebBackForwardListItem&) override;
</span><ins>+ virtual void didRemoveNavigationGestureSnapshot() override;
</ins><span class="cx">
</span><span class="cx"> virtual void didFirstVisuallyNonEmptyLayoutForMainFrame() override;
</span><span class="cx"> virtual void didFinishLoadForMainFrame() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -704,6 +704,11 @@
</span><span class="cx"> NavigationState::fromWebPage(*m_webView->_page).willRecordNavigationSnapshot(item);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::didRemoveNavigationGestureSnapshot()
+{
+ NavigationState::fromWebPage(*m_webView->_page).navigationGestureSnapshotWasRemoved();
+}
+
</ins><span class="cx"> void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -188,6 +188,7 @@
</span><span class="cx"> virtual void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
</span><span class="cx"> virtual void navigationGestureDidEnd() override;
</span><span class="cx"> virtual void willRecordNavigationSnapshot(WebBackForwardListItem&) override;
</span><ins>+ virtual void didRemoveNavigationGestureSnapshot() override;
</ins><span class="cx">
</span><span class="cx"> NSView *activeView() const;
</span><span class="cx"> NSWindow *activeWindow() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -765,6 +765,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::didRemoveNavigationGestureSnapshot()
+{
+#if WK_API_ENABLED
+ if (m_webView)
+ NavigationState::fromWebPage(*m_webView->_page).navigationGestureSnapshotWasRemoved();
+#endif
+}
+
</ins><span class="cx"> void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
</span><span class="cx"> {
</span><span class="cx"> [m_wkView _didFirstVisuallyNonEmptyLayoutForMainFrame];
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Tools/ChangeLog 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-02 Tim Horton <timothy_horton@apple.com>
+
+ Add a modern API way to know that the navigation gesture snapshot was removed, for WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=148693
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2015-09-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r188548): Some tests crash after r188548 because injected bundle messages are received after the test finishes
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (189273 => 189274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-03 03:19:18 UTC (rev 189273)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-03 05:51:22 UTC (rev 189274)
</span><span class="lines">@@ -295,6 +295,7 @@
</span><span class="cx"> 0, // didBeginNavigationGesture
</span><span class="cx"> 0, // willEndNavigationGesture
</span><span class="cx"> 0, // didEndNavigationGesture
</span><ins>+ 0, // didRemoveNavigationGestureSnapshot
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageNavigationClient(newPage, &pageNavigationClient.base);
</span><span class="cx">
</span><span class="lines">@@ -539,6 +540,7 @@
</span><span class="cx"> 0, // didBeginNavigationGesture
</span><span class="cx"> 0, // willEndNavigationGesture
</span><span class="cx"> 0, // didEndNavigationGesture
</span><ins>+ 0, // didRemoveNavigationGestureSnapshot
</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>