<!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>[198914] 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/198914">198914</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-03-31 13:52:44 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Automation: Navigation commands should not return until page loads or fails
https://bugs.webkit.org/show_bug.cgi?id=156063
rdar://problem/25464373
Reviewed by Brian Burg.
* UIProcess/Automation/Automation.json: Make navigation commands async.
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::navigateBrowsingContext): Save callback and timeout previous.
(WebKit::WebAutomationSession::goBackInBrowsingContext): Ditto.
(WebKit::WebAutomationSession::goForwardInBrowsingContext): Ditto.
(WebKit::WebAutomationSession::reloadBrowsingContext): Ditto.
(WebKit::WebAutomationSession::navigationOccuredForPage): Added. Fire callback for page.
* UIProcess/Automation/WebAutomationSession.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFinishLoadForFrame): Call WebAutomationSession::navigationOccuredForPage.
(WebKit::WebPageProxy::didFailLoadForFrame): Ditto.
(WebKit::WebPageProxy::didSameDocumentNavigationForFrame): Ditto.
* UIProcess/WebProcessPool.h: Added automationSession() getter.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAutomationAutomationjson">trunk/Source/WebKit2/UIProcess/Automation/Automation.json</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198913 => 198914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-31 20:52:38 UTC (rev 198913)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-31 20:52:44 UTC (rev 198914)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-31 Timothy Hatcher <timothy@apple.com>
+
+ Web Automation: Navigation commands should not return until page loads or fails
+
+ https://bugs.webkit.org/show_bug.cgi?id=156063
+ rdar://problem/25464373
+
+ Reviewed by Brian Burg.
+
+ * UIProcess/Automation/Automation.json: Make navigation commands async.
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::navigateBrowsingContext): Save callback and timeout previous.
+ (WebKit::WebAutomationSession::goBackInBrowsingContext): Ditto.
+ (WebKit::WebAutomationSession::goForwardInBrowsingContext): Ditto.
+ (WebKit::WebAutomationSession::reloadBrowsingContext): Ditto.
+ (WebKit::WebAutomationSession::navigationOccuredForPage): Added. Fire callback for page.
+ * UIProcess/Automation/WebAutomationSession.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFinishLoadForFrame): Call WebAutomationSession::navigationOccuredForPage.
+ (WebKit::WebPageProxy::didFailLoadForFrame): Ditto.
+ (WebKit::WebPageProxy::didSameDocumentNavigationForFrame): Ditto.
+
+ * UIProcess/WebProcessPool.h: Added automationSession() getter.
+
</ins><span class="cx"> 2016-03-30 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Automation: Add support for script timeouts to the evaluateJavaScriptFunction command
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationAutomationjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/Automation.json (198913 => 198914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-31 20:52:38 UTC (rev 198913)
+++ trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-31 20:52:44 UTC (rev 198914)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> "description": "This enum contains predefined error messages that can be used to signal a well-defined error condition, such as a missing implementation, unknown window handle, and so forth. The backend signals one of these errors by using it as a prefix of the commands's error message (the errorString argument in generated C++ backend dispatchers). This will be reported to the frontend as a protocol error with a JSON-RPC error code of 'ServerError'. It is up to the frontend whether and how to deal with errors.",
</span><span class="cx"> "enum": [
</span><span class="cx"> "InternalError",
</span><ins>+ "Timeout",
</ins><span class="cx"> "JavaScriptError",
</span><span class="cx"> "JavaScriptTimeout",
</span><span class="cx"> "WindowNotFound",
</span><span class="lines">@@ -250,28 +251,32 @@
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be navigated." },
</span><span class="cx"> { "name": "url", "type": "string", "description": "The URL to load in the browsing context." }
</span><del>- ]
</del><ins>+ ],
+ "async": true
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "goBackInBrowsingContext",
</span><span class="cx"> "description": "Navigates a browsing context to go back one page in history.",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be navigated." }
</span><del>- ]
</del><ins>+ ],
+ "async": true
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "goForwardInBrowsingContext",
</span><span class="cx"> "description": "Navigates a browsing context to got forward one page in history.",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be navigated." }
</span><del>- ]
</del><ins>+ ],
+ "async": true
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "reloadBrowsingContext",
</span><span class="cx"> "description": "Reloads the current page in a browsing context.",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be reloaded." }
</span><del>- ]
</del><ins>+ ],
+ "async": true
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "evaluateJavaScriptFunction",
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp (198913 => 198914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-31 20:52:38 UTC (rev 198913)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-31 20:52:44 UTC (rev 198914)
</span><span class="lines">@@ -357,44 +357,66 @@
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(InternalError);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAutomationSession::navigateBrowsingContext(Inspector::ErrorString& errorString, const String& handle, const String& url)
</del><ins>+void WebAutomationSession::navigateBrowsingContext(Inspector::ErrorString& errorString, const String& handle, const String& url, Ref<NavigateBrowsingContextCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = webPageProxyForHandle(handle);
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
</span><span class="cx">
</span><ins>+ if (auto callback = m_pendingNavigationInBrowsingContextCallbacksPerPage.take(page->pageID()))
+ callback->sendFailure(Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::Timeout));
+ m_pendingNavigationInBrowsingContextCallbacksPerPage.set(page->pageID(), WTFMove(callback));
+
</ins><span class="cx"> page->loadRequest(WebCore::URL(WebCore::URL(), url));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAutomationSession::goBackInBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
</del><ins>+void WebAutomationSession::goBackInBrowsingContext(Inspector::ErrorString& errorString, const String& handle, Ref<GoBackInBrowsingContextCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = webPageProxyForHandle(handle);
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
</span><span class="cx">
</span><ins>+ if (auto callback = m_pendingNavigationInBrowsingContextCallbacksPerPage.take(page->pageID()))
+ callback->sendFailure(Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::Timeout));
+ m_pendingNavigationInBrowsingContextCallbacksPerPage.set(page->pageID(), WTFMove(callback));
+
</ins><span class="cx"> page->goBack();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAutomationSession::goForwardInBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
</del><ins>+void WebAutomationSession::goForwardInBrowsingContext(Inspector::ErrorString& errorString, const String& handle, Ref<GoForwardInBrowsingContextCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = webPageProxyForHandle(handle);
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
</span><span class="cx">
</span><ins>+ if (auto callback = m_pendingNavigationInBrowsingContextCallbacksPerPage.take(page->pageID()))
+ callback->sendFailure(Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::Timeout));
+ m_pendingNavigationInBrowsingContextCallbacksPerPage.set(page->pageID(), WTFMove(callback));
+
</ins><span class="cx"> page->goForward();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAutomationSession::reloadBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
</del><ins>+void WebAutomationSession::reloadBrowsingContext(Inspector::ErrorString& errorString, const String& handle, Ref<ReloadBrowsingContextCallback>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = webPageProxyForHandle(handle);
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
</span><span class="cx">
</span><ins>+ if (auto callback = m_pendingNavigationInBrowsingContextCallbacksPerPage.take(page->pageID()))
+ callback->sendFailure(Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::Timeout));
+ m_pendingNavigationInBrowsingContextCallbacksPerPage.set(page->pageID(), WTFMove(callback));
+
</ins><span class="cx"> const bool reloadFromOrigin = false;
</span><span class="cx"> const bool contentBlockersEnabled = true;
</span><span class="cx"> page->reload(reloadFromOrigin, contentBlockersEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebAutomationSession::navigationOccurredForPage(const WebPageProxy& page)
+{
+ if (auto callback = m_pendingNavigationInBrowsingContextCallbacksPerPage.take(page.pageID()))
+ callback->sendSuccess(InspectorObject::create());
+}
+
</ins><span class="cx"> void WebAutomationSession::evaluateJavaScriptFunction(Inspector::ErrorString& errorString, const String& browsingContextHandle, const String* optionalFrameHandle, const String& function, const Inspector::InspectorArray& arguments, const bool* optionalExpectsImplicitCallbackArgument, const int* optionalCallbackTimeout, Ref<EvaluateJavaScriptFunctionCallback>&& callback)
</span><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = webPageProxyForHandle(browsingContextHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h (198913 => 198914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-31 20:52:38 UTC (rev 198913)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-31 20:52:44 UTC (rev 198914)
</span><span class="lines">@@ -83,6 +83,8 @@
</span><span class="cx"> WebProcessPool* processPool() const { return m_processPool; }
</span><span class="cx"> void setProcessPool(WebProcessPool*);
</span><span class="cx">
</span><ins>+ void navigationOccurredForPage(const WebPageProxy&);
+
</ins><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> // Inspector::RemoteAutomationTarget API
</span><span class="cx"> String name() const override { return m_sessionIdentifier; }
</span><span class="lines">@@ -99,10 +101,10 @@
</span><span class="cx"> void switchToBrowsingContext(Inspector::ErrorString&, const String& browsingContextHandle, const String* optionalFrameHandle) override;
</span><span class="cx"> void resizeWindowOfBrowsingContext(Inspector::ErrorString&, const String& handle, const Inspector::InspectorObject& size) override;
</span><span class="cx"> void moveWindowOfBrowsingContext(Inspector::ErrorString&, const String& handle, const Inspector::InspectorObject& position) override;
</span><del>- void navigateBrowsingContext(Inspector::ErrorString&, const String& handle, const String& url) override;
- void goBackInBrowsingContext(Inspector::ErrorString&, const String&) override;
- void goForwardInBrowsingContext(Inspector::ErrorString&, const String&) override;
- void reloadBrowsingContext(Inspector::ErrorString&, const String&) override;
</del><ins>+ void navigateBrowsingContext(Inspector::ErrorString&, const String& handle, const String& url, Ref<NavigateBrowsingContextCallback>&&) override;
+ void goBackInBrowsingContext(Inspector::ErrorString&, const String&, Ref<GoBackInBrowsingContextCallback>&&) override;
+ void goForwardInBrowsingContext(Inspector::ErrorString&, const String&, Ref<GoForwardInBrowsingContextCallback>&&) override;
+ void reloadBrowsingContext(Inspector::ErrorString&, const String&, Ref<ReloadBrowsingContextCallback>&&) override;
</ins><span class="cx"> void evaluateJavaScriptFunction(Inspector::ErrorString&, const String& browsingContextHandle, const String* optionalFrameHandle, const String& function, const Inspector::InspectorArray& arguments, const bool* optionalExpectsImplicitCallbackArgument, const int* optionalCallbackTimeout, Ref<Inspector::AutomationBackendDispatcherHandler::EvaluateJavaScriptFunctionCallback>&&) override;
</span><span class="cx"> void performMouseInteraction(Inspector::ErrorString&, const String& handle, const Inspector::InspectorObject& requestedPosition, const String& mouseButton, const String& mouseInteraction, const Inspector::InspectorArray& keyModifiers, RefPtr<Inspector::Protocol::Automation::Point>& updatedPosition) override;
</span><span class="cx"> void performKeyboardInteractions(Inspector::ErrorString&, const String& handle, const Inspector::InspectorArray& interactions) override;
</span><span class="lines">@@ -167,6 +169,8 @@
</span><span class="cx"> HashMap<uint64_t, String> m_webFrameHandleMap;
</span><span class="cx"> HashMap<String, uint64_t> m_handleWebFrameMap;
</span><span class="cx">
</span><ins>+ HashMap<uint64_t, RefPtr<Inspector::BackendDispatcher::CallbackBase>> m_pendingNavigationInBrowsingContextCallbacksPerPage;
+
</ins><span class="cx"> uint64_t m_nextEvaluateJavaScriptCallbackID { 1 };
</span><span class="cx"> HashMap<uint64_t, RefPtr<Inspector::AutomationBackendDispatcherHandler::EvaluateJavaScriptFunctionCallback>> m_evaluateJavaScriptFunctionCallbacks;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (198913 => 198914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-03-31 20:52:38 UTC (rev 198913)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-03-31 20:52:44 UTC (rev 198914)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> #include "TextCheckerState.h"
</span><span class="cx"> #include "UserMediaPermissionRequestProxy.h"
</span><span class="cx"> #include "WKContextPrivate.h"
</span><ins>+#include "WebAutomationSession.h"
</ins><span class="cx"> #include "WebBackForwardList.h"
</span><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="lines">@@ -3126,6 +3127,11 @@
</span><span class="cx"> if (isMainFrame)
</span><span class="cx"> m_pageLoadState.didFinishLoad(transaction);
</span><span class="cx">
</span><ins>+ if (isMainFrame && m_controlledByAutomation) {
+ if (auto* automationSession = process().processPool().automationSession())
+ automationSession->navigationOccurredForPage(*this);
+ }
+
</ins><span class="cx"> frame->didFinishLoad();
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.commitChanges();
</span><span class="lines">@@ -3160,6 +3166,11 @@
</span><span class="cx"> if (isMainFrame)
</span><span class="cx"> m_pageLoadState.didFailLoad(transaction);
</span><span class="cx">
</span><ins>+ if (isMainFrame && m_controlledByAutomation) {
+ if (auto* automationSession = process().processPool().automationSession())
+ automationSession->navigationOccurredForPage(*this);
+ }
+
</ins><span class="cx"> frame->didFailLoad();
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.commitChanges();
</span><span class="lines">@@ -3192,6 +3203,11 @@
</span><span class="cx"> if (isMainFrame)
</span><span class="cx"> m_pageLoadState.didSameDocumentNavigation(transaction, url);
</span><span class="cx">
</span><ins>+ if (isMainFrame && m_controlledByAutomation) {
+ if (auto* automationSession = process().processPool().automationSession())
+ automationSession->navigationOccurredForPage(*this);
+ }
+
</ins><span class="cx"> m_pageLoadState.clearPendingAPIRequestURL(transaction);
</span><span class="cx"> frame->didSameDocumentNavigation(url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (198913 => 198914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-03-31 20:52:38 UTC (rev 198913)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-03-31 20:52:44 UTC (rev 198914)
</span><span class="lines">@@ -259,6 +259,7 @@
</span><span class="cx">
</span><span class="cx"> void updateAutomationCapabilities() const;
</span><span class="cx"> void setAutomationSession(RefPtr<WebAutomationSession>&&);
</span><ins>+ WebAutomationSession* automationSession() const { return m_automationSession.get(); }
</ins><span class="cx">
</span><span class="cx"> // Defaults to false.
</span><span class="cx"> void setHTTPPipeliningEnabled(bool);
</span></span></pre>
</div>
</div>
</body>
</html>