<!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>[198754] 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/198754">198754</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-28 11:52:12 -0700 (Mon, 28 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Automation: report the browsing context's window frame (size and origin)
https://bugs.webkit.org/show_bug.cgi?id=155323
<rdar://problem/25094089>
Reviewed by Timothy Hatcher.
To prepare for implementing resize and move commands, add a
windowFrame member to the browsing context protocol type.
* UIProcess/Automation/Automation.json:
Add a frame Rect to BrowsingContext.
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::handleForWebPageProxy):
(WebKit::WebAutomationSession::buildBrowsingContextForPage):
Extract the code to build a BrowsingContext object. Add
code to calculate and insert the page's window frame size.
(WebKit::WebAutomationSession::getBrowsingContexts):
(WebKit::WebAutomationSession::getBrowsingContext):
(WebKit::WebAutomationSession::createBrowsingContext):
(WebKit::WebAutomationSession::switchToBrowsingContext):
Refactoring as above.
* UIProcess/Automation/WebAutomationSession.h:
Adjust signatures.
* UIProcess/WebPageProxy.h: Make getWindowFrame public.</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="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198753 => 198754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-28 18:39:21 UTC (rev 198753)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-28 18:52:12 UTC (rev 198754)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-03-28 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Automation: report the browsing context's window frame (size and origin)
+ https://bugs.webkit.org/show_bug.cgi?id=155323
+ <rdar://problem/25094089>
+
+ Reviewed by Timothy Hatcher.
+
+ To prepare for implementing resize and move commands, add a
+ windowFrame member to the browsing context protocol type.
+
+ * UIProcess/Automation/Automation.json:
+ Add a frame Rect to BrowsingContext.
+
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::handleForWebPageProxy):
+ (WebKit::WebAutomationSession::buildBrowsingContextForPage):
+ Extract the code to build a BrowsingContext object. Add
+ code to calculate and insert the page's window frame size.
+
+ (WebKit::WebAutomationSession::getBrowsingContexts):
+ (WebKit::WebAutomationSession::getBrowsingContext):
+ (WebKit::WebAutomationSession::createBrowsingContext):
+ (WebKit::WebAutomationSession::switchToBrowsingContext):
+ Refactoring as above.
+
+ * UIProcess/Automation/WebAutomationSession.h:
+ Adjust signatures.
+
+ * UIProcess/WebPageProxy.h: Make getWindowFrame public.
+
+2016-03-28 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Unreviewed, fix the build.
</span><span class="cx">
</span><span class="cx"> * WebProcess/Automation/WebAutomationSessionProxy.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationAutomationjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/Automation.json (198753 => 198754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-28 18:39:21 UTC (rev 198753)
+++ trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-28 18:52:12 UTC (rev 198754)
</span><span class="lines">@@ -63,7 +63,8 @@
</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><span class="cx"> { "name": "active", "type": "boolean", "description": "Whether the browsing context has focus at the time the command is handled." },
</span><del>- { "name": "url", "type": "string", "description": "The URL loaded by the browsing context at the time the command is handled." }
</del><ins>+ { "name": "url", "type": "string", "description": "The URL loaded by the browsing context at the time the command is handled." },
+ { "name": "windowFrame", "$ref": "Rect", "description": "The current frame (position and size) of the browsing context's window." }
</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 (198753 => 198754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-28 18:39:21 UTC (rev 198753)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-28 18:52:12 UTC (rev 198754)
</span><span class="lines">@@ -190,24 +190,47 @@
</span><span class="cx"> return handleForWebFrameID(webFrameProxy.frameID());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<Inspector::Protocol::Automation::BrowsingContext> WebAutomationSession::buildBrowsingContextForPage(WebPageProxy& page)
+{
+ WebCore::FloatRect windowFrame;
+ page.getWindowFrame(windowFrame);
+
+ auto originObject = Inspector::Protocol::Automation::Point::create()
+ .setX(windowFrame.x())
+ .setY(windowFrame.y())
+ .release();
+
+ auto sizeObject = Inspector::Protocol::Automation::Size::create()
+ .setWidth(windowFrame.width())
+ .setHeight(windowFrame.height())
+ .release();
+
+ auto windowFrameObject = Inspector::Protocol::Automation::Rect::create()
+ .setOrigin(WTFMove(originObject))
+ .setSize(WTFMove(sizeObject))
+ .release();
+
+ String handle = handleForWebPageProxy(page);
+
+ return Inspector::Protocol::Automation::BrowsingContext::create()
+ .setHandle(handle)
+ .setActive(m_activeBrowsingContextHandle == handle)
+ .setUrl(page.pageLoadState().activeURL())
+ .setWindowFrame(WTFMove(windowFrameObject))
+ .release();
+}
+
</ins><span class="cx"> void WebAutomationSession::getBrowsingContexts(Inspector::ErrorString& errorString, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingContext>>& contexts)
</span><span class="cx"> {
</span><span class="cx"> contexts = Inspector::Protocol::Array<Inspector::Protocol::Automation::BrowsingContext>::create();
</span><span class="cx">
</span><span class="cx"> for (auto& process : m_processPool->processes()) {
</span><del>- for (auto& page : process->pages()) {
</del><ins>+ for (auto* page : process->pages()) {
+ ASSERT(page);
</ins><span class="cx"> if (!page->isControlledByAutomation())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- String handle = handleForWebPageProxy(*page);
-
- auto browsingContext = Inspector::Protocol::Automation::BrowsingContext::create()
- .setHandle(handleForWebPageProxy(*page))
- .setActive(m_activeBrowsingContextHandle == handle)
- .setUrl(page->pageLoadState().activeURL())
- .release();
-
- contexts->addItem(browsingContext.copyRef());
</del><ins>+ contexts->addItem(buildBrowsingContextForPage(*page));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -218,11 +241,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
</span><span class="cx">
</span><del>- context = Inspector::Protocol::Automation::BrowsingContext::create()
- .setHandle(handleForWebPageProxy(*page))
- .setActive(m_activeBrowsingContextHandle == handle)
- .setUrl(page->pageLoadState().activeURL())
- .release();
</del><ins>+ context = buildBrowsingContextForPage(*page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebAutomationSession::createBrowsingContext(Inspector::ErrorString& errorString, String* handle)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h (198753 => 198754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-28 18:39:21 UTC (rev 198753)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h 2016-03-28 18:52:12 UTC (rev 198754)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> private:
</span><span class="cx"> WebPageProxy* webPageProxyForHandle(const String&);
</span><span class="cx"> String handleForWebPageProxy(const WebPageProxy&);
</span><ins>+ RefPtr<Inspector::Protocol::Automation::BrowsingContext> buildBrowsingContextForPage(WebPageProxy&);
</ins><span class="cx">
</span><span class="cx"> WebFrameProxy* webFrameProxyForHandle(const String&, WebPageProxy&);
</span><span class="cx"> String handleForWebFrameID(uint64_t frameID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (198753 => 198754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-03-28 18:39:21 UTC (rev 198753)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-03-28 18:52:12 UTC (rev 198754)
</span><span class="lines">@@ -1094,6 +1094,7 @@
</span><span class="cx"> void didRestoreScrollPosition();
</span><span class="cx">
</span><span class="cx"> void setFocus(bool focused);
</span><ins>+ void getWindowFrame(WebCore::FloatRect&);
</ins><span class="cx">
</span><span class="cx"> bool isResourceCachingDisabled() const { return m_isResourceCachingDisabled; }
</span><span class="cx"> void setResourceCachingDisabled(bool);
</span><span class="lines">@@ -1198,7 +1199,6 @@
</span><span class="cx"> void setIsResizable(bool isResizable);
</span><span class="cx"> void getIsResizable(bool& isResizable);
</span><span class="cx"> void setWindowFrame(const WebCore::FloatRect&);
</span><del>- void getWindowFrame(WebCore::FloatRect&);
</del><span class="cx"> void screenToRootView(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint);
</span><span class="cx"> void rootViewToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result);
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>