Changeset 203316 in webkit

Timestamp:

Jul 15, 2016, 6:19:21 PM (10 years ago)

Author:

timothy@apple.com

Message:

Web Automation: Fix element and event coord space issues
​https://bugs.webkit.org/show_bug.cgi?id=159851
rdar://problem/27375780

Reviewed by Brian Burg.

• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::performMouseInteraction): Subtract topContentInset() before
it goes back out to WebDriver.

• WebProcess/Automation/WebAutomationSessionProxy.cpp:

(WebKit::WebAutomationSessionProxy::computeElementLayout): When using useViewportCoordinates,
subtract topContentInset() so it matches expectations.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Automation/WebAutomationSession.cpp (modified) (1 diff)
• WebProcess/Automation/WebAutomationSessionProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-07-15  Timothy Hatcher  <timothy@apple.com>
+
+        Web Automation: Fix element and event coord space issues
+        https://bugs.webkit.org/show_bug.cgi?id=159851
+        rdar://problem/27375780
+
+        Reviewed by Brian Burg.
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::performMouseInteraction): Subtract topContentInset() before
+        it goes back out to WebDriver.
+        * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+        (WebKit::WebAutomationSessionProxy::computeElementLayout): When using useViewportCoordinates,
+        subtract topContentInset() so it matches expectations.
+
 2016-07-15  Beth Dakin  <bdakin@apple.com>
 

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

@@ -919 +919 @@
     updatedPositionObject = Inspector::Protocol::Automation::Point::create()
         .setX(x)
-        .setY(y)
+        .setY(y - page->topContentInset())
         .release();
 #endif // USE(APPKIT)

trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp

@@ -488 +488 @@
     WebCore::IntRect rect = coreElement->clientRect();
 
-    if (!useViewportCoordinates) {
-        WebCore::Frame* coreFrame = frame->coreFrame();
-        if (!coreFrame) {
-            WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidComputeElementLayout(callbackID, WebCore::IntRect(), frameNotFoundErrorType), 0);
-            return;
-        }
-
-        WebCore::FrameView *coreFrameView = coreFrame->view();
-        if (!coreFrameView) {
-            WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidComputeElementLayout(callbackID, WebCore::IntRect(), frameNotFoundErrorType), 0);
-            return;
-        }
-
+    WebCore::Frame* coreFrame = frame->coreFrame();
+    if (!coreFrame) {
+        WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidComputeElementLayout(callbackID, WebCore::IntRect(), frameNotFoundErrorType), 0);
+        return;
+    }
+
+    WebCore::FrameView *coreFrameView = coreFrame->view();
+    if (!coreFrameView) {
+        WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidComputeElementLayout(callbackID, WebCore::IntRect(), frameNotFoundErrorType), 0);
+        return;
+    }
+
+    if (useViewportCoordinates)
+        rect.moveBy(WebCore::IntPoint(0, -coreFrameView->topContentInset()));
+    else
         rect = coreFrameView->rootViewToContents(rect);
-    }
 
     WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidComputeElementLayout(callbackID, rect, String()), 0);