Changeset 262861 in webkit

Timestamp:

Jun 10, 2020, 2:44:04 PM (6 years ago)

Author:

BJ Burg

Message:

WebDriver on non-iOS ports cannot perform ActionChain which has scrolling down to the element and click it
​https://bugs.webkit.org/show_bug.cgi?id=208232
<rdar://problem/59859491>

Reviewed by Devin Rousso.

Source/WebCore:

• platform/ScrollView.h:
• platform/ScrollView.cpp:

(WebCore::ScrollView::rootViewToContents const):
Create a version of this function that works with FloatPoint.

Source/WebKit:

• UIProcess/Automation/mac/WebAutomationSessionMac.mm:

(WebKit::WebAutomationSession::platformSimulateMouseInteraction):
The provided coordinates are in LayoutViewport coordinate system, which does
not take topContentInset into account. Add back in the topContentInset
when translating to flipped window coordinates.

• WebProcess/Automation/WebAutomationSessionProxy.cpp:

(WebKit::WebAutomationSessionProxy::computeElementLayout):
The calculations of element bounds and IVCP have an incorrect handling of
root coordinates as contents/absolute coordinates. Add the missing conversion.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ScrollView.cpp (modified) (1 diff)
• WebCore/platform/ScrollView.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm (modified) (1 diff)
• WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-10  Brian Burg  <bburg@apple.com>
+
+        WebDriver on non-iOS ports cannot perform ActionChain which has scrolling down to the element and click it
+        https://bugs.webkit.org/show_bug.cgi?id=208232
+        <rdar://problem/59859491>
+
+        Reviewed by Devin Rousso.
+
+        * platform/ScrollView.h:
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::rootViewToContents const):
+        Create a version of this function that works with FloatPoint.
+
 2020-06-10  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -945 +945 @@
 }
 
+FloatPoint ScrollView::rootViewToContents(const FloatPoint& rootViewPoint) const
+{
+    return viewToContents(convertFromRootView(rootViewPoint));
+}
+
 IntPoint ScrollView::rootViewToContents(const IntPoint& rootViewPoint) const
 {

trunk/Source/WebCore/platform/ScrollView.h

@@ -280 +280 @@
     bool scrollbarsSuppressed() const { return m_scrollbarsSuppressed; }
 
+    WEBCORE_EXPORT FloatPoint rootViewToContents(const FloatPoint&) const;
     WEBCORE_EXPORT IntPoint rootViewToContents(const IntPoint&) const;
     WEBCORE_EXPORT IntPoint contentsToRootView(const IntPoint&) const;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-10  Brian Burg  <bburg@apple.com>
+
+        WebDriver on non-iOS ports cannot perform ActionChain which has scrolling down to the element and click it
+        https://bugs.webkit.org/show_bug.cgi?id=208232
+        <rdar://problem/59859491>
+
+        Reviewed by Devin Rousso.
+
+        * UIProcess/Automation/mac/WebAutomationSessionMac.mm:
+        (WebKit::WebAutomationSession::platformSimulateMouseInteraction):
+        The provided coordinates are in LayoutViewport coordinate system, which does
+        not take topContentInset into account. Add back in the topContentInset
+        when translating to flipped window coordinates.
+
+        * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+        (WebKit::WebAutomationSessionProxy::computeElementLayout):
+        The calculations of element bounds and IVCP have an incorrect handling of
+        root coordinates as contents/absolute coordinates. Add the missing conversion.
+
 2020-06-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm

@@ -141 +141 @@
     IntRect windowRect;
 
-    IntPoint locationInView = WebCore::IntPoint(locationInViewport.x(), locationInViewport.y());
+    IntPoint locationInView = locationInViewport + IntPoint(0, page.topContentInset());
     page.rootViewToWindow(IntRect(locationInView, IntSize()), windowRect);
     IntPoint locationInWindow = windowRect.location();

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

@@ -689 +689 @@
         break;
     case CoordinateSystem::LayoutViewport:
-        resultElementBounds = enclosingIntRect(mainView->absoluteToLayoutViewportRect(elementBoundsInRootCoordinates));
+        resultElementBounds = enclosingIntRect(mainView->absoluteToLayoutViewportRect(mainView->rootViewToContents(elementBoundsInRootCoordinates)));
         break;
     }
@@ -743 +743 @@
     switch (coordinateSystem) {
     case CoordinateSystem::Page:
-        resultInViewCenterPoint = roundedIntPoint(mainView->absoluteToDocumentPoint(inViewCenterPointInRootCoordinates));
+        resultInViewCenterPoint = roundedIntPoint(mainView->absoluteToDocumentPoint(mainView->rootViewToContents(inViewCenterPointInRootCoordinates)));
         break;
     case CoordinateSystem::LayoutViewport:
-        resultInViewCenterPoint = roundedIntPoint(mainView->absoluteToLayoutViewportPoint(inViewCenterPointInRootCoordinates));
+        resultInViewCenterPoint = roundedIntPoint(mainView->absoluteToLayoutViewportPoint(mainView->rootViewToContents(inViewCenterPointInRootCoordinates)));
         break;
     }