<!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>[197620] 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/197620">197620</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-03-05 16:40:01 -0800 (Sat, 05 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename Automation protocol methods to use "BrowsingContext" instead of "Window".
Also flesh out the protocol commands more by adding switchToBrowsingContext
and return a BrowsingContextHandle for createBrowsingContext.
https://bugs.webkit.org/show_bug.cgi?id=154953
rdar://problem/24947489
Reviewed by Brian Burg.
* UIProcess/Automation/Automation.json:
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::getBrowsingContexts):
(WebKit::WebAutomationSession::createBrowsingContext):
(WebKit::WebAutomationSession::closeBrowsingContext):
(WebKit::WebAutomationSession::switchToBrowsingContext):
(WebKit::WebAutomationSession::getWindows): Deleted.
(WebKit::WebAutomationSession::openWindow): Deleted.
(WebKit::WebAutomationSession::closeWindow): Deleted.
* 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 (197619 => 197620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-06 00:28:39 UTC (rev 197619)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-06 00:40:01 UTC (rev 197620)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-05 Timothy Hatcher <timothy@apple.com>
+
+ Rename Automation protocol methods to use "BrowsingContext" instead of "Window".
+ Also flesh out the protocol commands more by adding switchToBrowsingContext
+ and return a BrowsingContextHandle for createBrowsingContext.
+
+ https://bugs.webkit.org/show_bug.cgi?id=154953
+ rdar://problem/24947489
+
+ Reviewed by Brian Burg.
+
+ * UIProcess/Automation/Automation.json:
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::getBrowsingContexts):
+ (WebKit::WebAutomationSession::createBrowsingContext):
+ (WebKit::WebAutomationSession::closeBrowsingContext):
+ (WebKit::WebAutomationSession::switchToBrowsingContext):
+ (WebKit::WebAutomationSession::getWindows): Deleted.
+ (WebKit::WebAutomationSession::openWindow): Deleted.
+ (WebKit::WebAutomationSession::closeWindow): Deleted.
+ * UIProcess/Automation/WebAutomationSession.h:
+
</ins><span class="cx"> 2016-03-05 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Support Reflect.construct
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationAutomationjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/Automation.json (197619 => 197620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-06 00:28:39 UTC (rev 197619)
+++ trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-06 00:40:01 UTC (rev 197620)
</span><span class="lines">@@ -3,46 +3,58 @@
</span><span class="cx"> "description": "Automation domain exposes commands for automating user interactions with the browser.",
</span><span class="cx"> "types": [
</span><span class="cx"> {
</span><del>- "id": "OpaqueWindowHandle",
</del><ins>+ "id": "BrowsingContextHandle",
</ins><span class="cx"> "type": "string",
</span><del>- "description": "An opaque identifier for a window."
</del><ins>+ "description": "An opaque identifier for a browsing context."
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "id": "ErrorMessage",
</span><span class="cx"> "type": "string",
</span><ins>+ "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.",
</ins><span class="cx"> "enum": [
</span><ins>+ "InternalError",
+ "WindowNotFound",
</ins><span class="cx"> "NotImplemented"
</span><del>- ],
- "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."
</del><ins>+ ]
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- "id": "BrowsingWindow",
</del><ins>+ "id": "BrowsingContext",
</ins><span class="cx"> "type": "object",
</span><span class="cx"> "description": "A handle representing an open window or tab in the automation session.",
</span><span class="cx"> "properties": [
</span><del>- { "name": "handle", "$ref": "OpaqueWindowHandle", "description": "Opaque handle for the window. Used as a key for window-related commands." },
- { "name": "active", "type": "boolean", "description": "Whether the window is active at the time the command is handled." }
</del><ins>+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "Opaque handle for a browsing context (window or tab). Used as a key for window-related commands." },
+ { "name": "active", "type": "boolean", "description": "Whether the browsing context has focus at the time the command is handled." }
</ins><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "commands": [
</span><span class="cx"> {
</span><del>- "name": "getWindows",
</del><ins>+ "name": "getBrowsingContexts",
+ "description": "Fetches information about all open browsing contexts (windows and tabs) in the automation session.",
</ins><span class="cx"> "returns": [
</span><del>- { "name": "windows", "type": "array", "items": { "$ref": "BrowsingWindow"}, "description": "All known windows and tabs in the browsing session." }
- ],
- "description": "Gets information about all open windows and tabs in the automation session."
</del><ins>+ { "name": "contexts", "type": "array", "items": { "$ref": "BrowsingContext" }, "description": "All known browsing contexts available to the session." }
+ ]
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "openWindow",
- "description": "Opens a new automation window in the current browsing context."
</del><ins>+ "name": "createBrowsingContext",
+ "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.",
+ "returns": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "An opaque handle for the newly created browsing context." }
+ ]
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "closeWindow",
</del><ins>+ "name": "closeBrowsingContext",
+ "description": "Try to close the specified browsing context. This can trigger an unload prompt and thereafter succeed or fail.",
</ins><span class="cx"> "parameters": [
</span><del>- { "name": "handle", "$ref": "OpaqueWindowHandle", "description": "The handle for the window that should be closed." }
- ],
- "description": "Closes the specified window."
</del><ins>+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be closed." }
+ ]
+ },
+ {
+ "name": "switchToBrowsingContext",
+ "description": "Activates the specified browsing context.",
+ "parameters": [
+ { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context that should be made active." }
+ ]
</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 (197619 => 197620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-06 00:28:39 UTC (rev 197619)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-06 00:40:01 UTC (rev 197620)
</span><span class="lines">@@ -99,19 +99,24 @@
</span><span class="cx">
</span><span class="cx"> // Inspector::AutomationBackendDispatcherHandler API
</span><span class="cx">
</span><del>-void WebAutomationSession::getWindows(Inspector::ErrorString& errorString, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingWindow>>& out_windows)
</del><ins>+void WebAutomationSession::getBrowsingContexts(Inspector::ErrorString& errorString, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingContext>>& contexts)
</ins><span class="cx"> {
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(NotImplemented);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAutomationSession::openWindow(Inspector::ErrorString& errorString)
</del><ins>+void WebAutomationSession::createBrowsingContext(Inspector::ErrorString& errorString, String* handle)
</ins><span class="cx"> {
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(NotImplemented);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAutomationSession::closeWindow(Inspector::ErrorString& errorString, const String& in_handle)
</del><ins>+void WebAutomationSession::closeBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
</ins><span class="cx"> {
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(NotImplemented);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebAutomationSession::switchToBrowsingContext(Inspector::ErrorString& errorString, const String& handle)
+{
+ FAIL_WITH_PREDEFINED_ERROR_MESSAGE(NotImplemented);
+}
+
</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 (197619 => 197620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-06 00:28:39 UTC (rev 197619)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-06 00:40:01 UTC (rev 197620)
</span><span class="lines">@@ -71,9 +71,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Inspector::AutomationBackendDispatcherHandler API
</span><del>- void getWindows(Inspector::ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingWindow>>& out_windows) override;
- void openWindow(Inspector::ErrorString&) override;
- void closeWindow(Inspector::ErrorString&, const String& in_handle) override;
</del><ins>+ void getBrowsingContexts(Inspector::ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingContext>>&) override;
+ void createBrowsingContext(Inspector::ErrorString&, String*) override;
+ void closeBrowsingContext(Inspector::ErrorString&, const String&) override;
+ void switchToBrowsingContext(Inspector::ErrorString&, const String&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::unique_ptr<API::AutomationSessionClient> m_client;
</span></span></pre>
</div>
</div>
</body>
</html>