Title: [198759] trunk/Source/WebKit2
- Revision
- 198759
- Author
- bb...@apple.com
- Date
- 2016-03-28 15:34:36 -0700 (Mon, 28 Mar 2016)
Log Message
Web Automation: split protocol object BrowsingContext.windowFrame into two separate members
https://bugs.webkit.org/show_bug.cgi?id=155952
<rdar://problem/25393597>
Reviewed by Timothy Hatcher.
Using the name 'windowFrame' causes conflicts with some Objective-C code.
* UIProcess/Automation/Automation.json:
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::buildBrowsingContextForPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (198758 => 198759)
--- trunk/Source/WebKit2/ChangeLog 2016-03-28 21:37:39 UTC (rev 198758)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-28 22:34:36 UTC (rev 198759)
@@ -1,3 +1,17 @@
+2016-03-28 Brian Burg <bb...@apple.com>
+
+ Web Automation: split protocol object BrowsingContext.windowFrame into two separate members
+ https://bugs.webkit.org/show_bug.cgi?id=155952
+ <rdar://problem/25393597>
+
+ Reviewed by Timothy Hatcher.
+
+ Using the name 'windowFrame' causes conflicts with some Objective-C code.
+
+ * UIProcess/Automation/Automation.json:
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::buildBrowsingContextForPage):
+
2016-03-28 Carlos Alberto Lopez Perez <clo...@igalia.com>
[CMake] Unreviewed build fix after r198736.
Modified: trunk/Source/WebKit2/UIProcess/Automation/Automation.json (198758 => 198759)
--- trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-28 21:37:39 UTC (rev 198758)
+++ trunk/Source/WebKit2/UIProcess/Automation/Automation.json 2016-03-28 22:34:36 UTC (rev 198759)
@@ -64,7 +64,8 @@
{ "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." },
{ "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." }
+ { "name": "windowSize", "$ref": "Size", "description": "The current size of the browsing context's window." },
+ { "name": "windowOrigin", "$ref": "Point", "description": "The current (x, y) position of the browsing context's window relative to the top-left of the screen." }
]
}
],
Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp (198758 => 198759)
--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-28 21:37:39 UTC (rev 198758)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp 2016-03-28 22:34:36 UTC (rev 198759)
@@ -205,18 +205,14 @@
.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))
+ .setWindowOrigin(WTFMove(originObject))
+ .setWindowSize(WTFMove(sizeObject))
.release();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
