Changeset 198760 in webkit

Timestamp:

Mar 28, 2016 3:34:44 PM (8 years ago)

Author:

BJ Burg

Message:

Web Automation: add commands to move and resize a browsing context's window
​https://bugs.webkit.org/show_bug.cgi?id=155349
<rdar://problem/25104911>

Reviewed by Timothy Hatcher.

Parse the new origin or size and request the window to change to the
new frame. This calls through to PageUIClient::setWindowFrame().

• UIProcess/Automation/Automation.json:

Add new enum values for protocol parsing error cases.
Add new commands.

• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::resizeWindowOfBrowsingContext):
(WebKit::WebAutomationSession::moveWindowOfBrowsingContext):
Added. Parse the incoming payload and bail if nothing would happen
or the values are not usable or out of range. Complain if a change
did not happen when the requested and actual size are different.

• UIProcess/Automation/WebAutomationSession.h:
• UIProcess/WebPageProxy.h: Move setWindowFrame to be public.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Automation/Automation.json (modified) (2 diffs)
• UIProcess/Automation/WebAutomationSession.cpp (modified) (1 diff)
• UIProcess/Automation/WebAutomationSession.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-03-28  Brian Burg  <bburg@apple.com>
+
+        Web Automation: add commands to move and resize a browsing context's window
+        https://bugs.webkit.org/show_bug.cgi?id=155349
+        <rdar://problem/25104911>
+
+        Reviewed by Timothy Hatcher.
+
+        Parse the new origin or size and request the window to change to the
+        new frame. This calls through to PageUIClient::setWindowFrame().
+
+        * UIProcess/Automation/Automation.json:
+        Add new enum values for protocol parsing error cases.
+        Add new commands.
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::resizeWindowOfBrowsingContext):
+        (WebKit::WebAutomationSession::moveWindowOfBrowsingContext):
+        Added. Parse the incoming payload and bail if nothing would happen
+        or the values are not usable or out of range. Complain if a change
+        did not happen when the requested and actual size are different.
+
+        * UIProcess/Automation/WebAutomationSession.h:
+        * UIProcess/WebPageProxy.h: Move setWindowFrame to be public.
+
 2016-03-28  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit2/UIProcess/Automation/Automation.json

@@ -54 +54 @@
                 "NoJavaScriptDialog",
                 "NotImplemented",
-                "MissingParameter"
+                "MissingParameter",
+                "InvalidParameter"
             ]
         },
@@ -111 +112 @@
         },
         {
+            "name": "resizeWindowOfBrowsingContext",
+            "description": "Resizes the window of the specified browsing context to the specified size.",
+            "parameters": [
+                { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context to be resized." },
+                { "name": "size", "$ref": "Size", "description": "The new size for the browsing context's window." }
+            ]
+        },
+        {
+            "name": "moveWindowOfBrowsingContext",
+            "description": "Moves the window of the specified browsing context to the specified position.",
+            "parameters": [
+                { "name": "handle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context to be moved." },
+                { "name": "origin", "$ref": "Point", "description": "The new origin for the browsing context's window. The position is interpreted in screen coordinate space, relative to the upper left corner of the screen." }
+            ]
+        },
+        {
             "name": "navigateBrowsingContext",
             "description": "Navigates a browsing context to a specified URL.",

trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp

@@ -283 +283 @@
 }
 
+void WebAutomationSession::resizeWindowOfBrowsingContext(Inspector::ErrorString& errorString, const String& handle, const Inspector::InspectorObject& sizeObject)
+{
+    // FIXME <rdar://problem/25094106>: Specify what parameter was missing or invalid and how.
+    // This requires some changes to the other end's error handling. Right now it looks for an
+    // exact error message match. We could stuff this into the 'data' field on error object.
+    float width;
+    if (!sizeObject.getDouble(WTF::ASCIILiteral("width"), width))
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(MissingParameter);
+
+    float height;
+    if (!sizeObject.getDouble(WTF::ASCIILiteral("height"), height))
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(MissingParameter);
+
+    if (width < 0 || height < 0)
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(InvalidParameter);
+
+    WebPageProxy* page = webPageProxyForHandle(handle);
+    if (!page)
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+    WebCore::FloatRect originalFrame;
+    page->getWindowFrame(originalFrame);
+    
+    WebCore::FloatRect newFrame = WebCore::FloatRect(originalFrame.location(), WebCore::FloatSize(width, height));
+    if (newFrame == originalFrame)
+        return;
+
+    page->setWindowFrame(newFrame);
+    
+    // If nothing changed at all, it's probably fair to report that something went wrong.
+    // (We can't assume that the requested frame size will be honored exactly, however.)
+    WebCore::FloatRect updatedFrame;
+    page->getWindowFrame(updatedFrame);
+    if (originalFrame == updatedFrame)
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(InternalError);
+}
+
+void WebAutomationSession::moveWindowOfBrowsingContext(Inspector::ErrorString& errorString, const String& handle, const Inspector::InspectorObject& positionObject)
+{
+    // FIXME <rdar://problem/25094106>: Specify what parameter was missing or invalid and how.
+    // This requires some changes to the other end's error handling. Right now it looks for an
+    // exact error message match. We could stuff this into the 'data' field on error object.
+    float x;
+    if (!positionObject.getDouble(WTF::ASCIILiteral("x"), x))
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(MissingParameter);
+
+    float y;
+    if (!positionObject.getDouble(WTF::ASCIILiteral("y"), y))
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(MissingParameter);
+
+    if (x < 0 || y < 0)
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(InvalidParameter);
+
+    WebPageProxy* page = webPageProxyForHandle(handle);
+    if (!page)
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(WindowNotFound);
+
+    WebCore::FloatRect originalFrame;
+    page->getWindowFrame(originalFrame);
+    
+    WebCore::FloatRect newFrame = WebCore::FloatRect(WebCore::FloatPoint(x, y), originalFrame.size());
+    if (newFrame == originalFrame)
+        return;
+
+    page->setWindowFrame(newFrame);
+    
+    // If nothing changed at all, it's probably fair to report that something went wrong.
+    // (We can't assume that the requested frame size will be honored exactly, however.)
+    WebCore::FloatRect updatedFrame;
+    page->getWindowFrame(updatedFrame);
+    if (originalFrame == updatedFrame)
+        FAIL_WITH_PREDEFINED_ERROR_MESSAGE(InternalError);
+}
+
 void WebAutomationSession::navigateBrowsingContext(Inspector::ErrorString& errorString, const String& handle, const String& url)
 {

trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h

@@ -88 +88 @@
     void closeBrowsingContext(Inspector::ErrorString&, const String&) override;
     void switchToBrowsingContext(Inspector::ErrorString&, const String& browsingContextHandle, const String* optionalFrameHandle) override;
+    void resizeWindowOfBrowsingContext(Inspector::ErrorString&, const String& handle, const Inspector::InspectorObject& size) override;
+    void moveWindowOfBrowsingContext(Inspector::ErrorString&, const String& handle, const Inspector::InspectorObject& position) override;
     void navigateBrowsingContext(Inspector::ErrorString&, const String& handle, const String& url) override;
     void goBackInBrowsingContext(Inspector::ErrorString&, const String&) override;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -1095 +1095 @@
 
     void setFocus(bool focused);
+    void setWindowFrame(const WebCore::FloatRect&);
     void getWindowFrame(WebCore::FloatRect&);
 
@@ -1199 +1200 @@
     void setIsResizable(bool isResizable);
     void getIsResizable(bool& isResizable);
-    void setWindowFrame(const WebCore::FloatRect&);
     void screenToRootView(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint);
     void rootViewToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result);