<!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>[197773] 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/197773">197773</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-03-08 09:55:01 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add automation protocol methods for navigation
https://bugs.webkit.org/show_bug.cgi?id=155163
rdar://problem/25029054
Reviewed by Darin Adler.
* UIProcess/Automation/Automation.json:
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::getBrowsingContexts): Set url.
(WebKit::WebAutomationSession::getBrowsingContext): Added.
(WebKit::WebAutomationSession::navigateBrowsingContext): Added.
(WebKit::WebAutomationSession::goBackInBrowsingContext): Added.
(WebKit::WebAutomationSession::goForwardInBrowsingContext): Added.
(WebKit::WebAutomationSession::reloadBrowsingContext): Added.
* UIProcess/Automation/WebAutomationSession.h:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197772 => 197773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-08 17:41:59 UTC (rev 197772)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-08 17:55:01 UTC (rev 197773)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-08 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Add automation protocol methods for navigation
+
+ https://bugs.webkit.org/show_bug.cgi?id=155163
+ rdar://problem/25029054
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/Automation/Automation.json:
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::getBrowsingContexts): Set url.
+ (WebKit::WebAutomationSession::getBrowsingContext): Added.
+ (WebKit::WebAutomationSession::navigateBrowsingContext): Added.
+ (WebKit::WebAutomationSession::goBackInBrowsingContext): Added.
+ (WebKit::WebAutomationSession::goForwardInBrowsingContext): Added.
+ (WebKit::WebAutomationSession::reloadBrowsingContext): Added.
+ * UIProcess/Automation/WebAutomationSession.h:
+
</ins><span class="cx"> 2016-03-08 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Force allow user zoom
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationAutomationjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/Automation.json (197772 => 197773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-08 17:41:59 UTC (rev 197772)
+++ trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-08 17:55:01 UTC (rev 197773)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> "description": "A handle representing an open window or tab in the automation session.",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "handle", "$ref": "BrowsingContextHandle", "description": "Opaque handle for a browsing context (window or tab). Used as a key for window-related commands." },
</span><del>- { "name": "active", "type": "boolean", "description": "Whether the browsing context has focus at the time the command is handled." }
</del><ins>+ { "name": "active", "type": "boolean", "description": "Whether the browsing context has focus at the time the command is handled." },
+ { "name": "url", "type": "string", "description": "The URL loaded by the browsing context at the time the command is handled." }
</ins><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> ],
</span><span class="lines">@@ -36,6 +37,16 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "name": "getBrowsingContext",
+ "description": "Fetches information about the specified browsing context.",
+ "parameters": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context." }
+ ],
+ "returns": [
+ { "name": "context", "$ref": "BrowsingContext", "description": "The browsing context available to the session." }
+ ]
+ },
+ {
</ins><span class="cx"> "name": "createBrowsingContext",
</span><span class="cx"> "description": "Opens a new browsing context in the automation session and makes it the active browsing context for user interaction. This command creates a browsing context in a new window rather than adding a tab to an existing window.",
</span><span class="cx"> "returns": [
</span><span class="lines">@@ -55,6 +66,35 @@
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be made active." }
</span><span class="cx"> ]
</span><ins>+ },
+ {
+ "name": "navigateBrowsingContext",
+ "description": "Navigates a browsing context to a specified URL.",
+ "parameters": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be navigated." },
+ { "name": "url", "type": "string", "description": "The URL to load in the browsing context." }
+ ]
+ },
+ {
+ "name": "goBackInBrowsingContext",
+ "description": "Navigates a browsing context to go back one page in history.",
+ "parameters": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be navigated." }
+ ]
+ },
+ {
+ "name": "goForwardInBrowsingContext",
+ "description": "Navigates a browsing context to got forward one page in history.",
+ "parameters": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be navigated." }
+ ]
+ },
+ {
+ "name": "reloadBrowsingContext",
+ "description": "Reloads the current page in a browsing context.",
+ "parameters": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be reloaded." }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp (197772 => 197773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-08 17:41:59 UTC (rev 197772)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-08 17:55:01 UTC (rev 197773)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <JavaScriptCore/InspectorFrontendRouter.h>
</span><ins>+#include <WebCore/URL.h>
</ins><span class="cx"> #include <WebCore/UUID.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="lines">@@ -141,6 +142,7 @@
</span><span class="cx"> auto browsingContext = Inspector::Protocol::Automation::BrowsingContext::create()
</span><span class="cx"> .setHandle(handleForWebPageProxy(page))
</span><span class="cx"> .setActive(m_activeBrowsingContextHandle == handle)
</span><ins>+ .setUrl(page->pageLoadState().activeURL())
</ins><span class="cx"> .release();
</span><span class="cx">
</span><span class="cx"> contexts->addItem(browsingContext.copyRef());
</span><span class="lines">@@ -148,6 +150,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebAutomationSession::getBrowsingContext(Inspector::ErrorString& errorString, const String& handle, RefPtr<Inspector::Protocol::Automation::BrowsingContext>& context)
+{
+ WebPageProxy* page = webPageProxyForHandle(handle);
+ if (!page)
+ FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+ context = Inspector::Protocol::Automation::BrowsingContext::create()
+ .setHandle(handleForWebPageProxy(page))
+ .setActive(m_activeBrowsingContextHandle == handle)
+ .setUrl(page->pageLoadState().activeURL())
+ .release();
+}
+
</ins><span class="cx"> void WebAutomationSession::createBrowsingContext(Inspector::ErrorString& errorString, String* handle)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_client);
</span><span class="lines">@@ -186,4 +201,42 @@
</span><span class="cx"> page->setFocus(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebAutomationSession::navigateBrowsingContext(Inspector::ErrorString& errorString, const String& handle, const String& url)
+{
+ WebPageProxy* page = webPageProxyForHandle(handle);
+ if (!page)
+ FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+ page->loadRequest(WebCore::URL(WebCore::URL(), url));
+}
+
+void WebAutomationSession::goBackInBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
+{
+ WebPageProxy* page = webPageProxyForHandle(handle);
+ if (!page)
+ FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+ page->goBack();
+}
+
+void WebAutomationSession::goForwardInBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
+{
+ WebPageProxy* page = webPageProxyForHandle(handle);
+ if (!page)
+ FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+ page->goForward();
+}
+
+void WebAutomationSession::reloadBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
+{
+ WebPageProxy* page = webPageProxyForHandle(handle);
+ if (!page)
+ FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = true;
+ page->reload(reloadFromOrigin, contentBlockersEnabled);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h (197772 => 197773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-08 17:41:59 UTC (rev 197772)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-08 17:55:01 UTC (rev 197773)
</span><span class="lines">@@ -80,9 +80,14 @@
</span><span class="cx">
</span><span class="cx"> // Inspector::AutomationBackendDispatcherHandler API
</span><span class="cx"> void getBrowsingContexts(Inspector::ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingContext>>&) override;
</span><ins>+ void getBrowsingContext(Inspector::ErrorString&, const String&, RefPtr<Inspector::Protocol::Automation::BrowsingContext>&) override;
</ins><span class="cx"> void createBrowsingContext(Inspector::ErrorString&, String*) override;
</span><span class="cx"> void closeBrowsingContext(Inspector::ErrorString&, const String&) override;
</span><span class="cx"> void switchToBrowsingContext(Inspector::ErrorString&, const String&) override;
</span><ins>+ 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;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebKit::WebPageProxy* webPageProxyForHandle(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>