Changeset 200274 in webkit

Timestamp:

Apr 29, 2016, 6:14:39 PM (9 years ago)

Author:

BJ Burg

Message:

Web Automation: performMouseInteraction command computes mouse event coordinates incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=157218
<rdar://problem/26018230>

Reviewed by Timothy Hatcher.

This patch fixes two issues: the min/max clamp was in the wrong order,
and the y-value did not account for the window's top content inset.

• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::performMouseInteraction):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-29  Brian Burg  <bburg@apple.com>
+
+        Web Automation: performMouseInteraction command computes mouse event coordinates incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=157218
+        <rdar://problem/26018230>
+
+        Reviewed by Timothy Hatcher.
+
+        This patch fixes two issues: the min/max clamp was in the wrong order,
+        and the y-value did not account for the window's top content inset.
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::performMouseInteraction):
+
 2016-04-29  Dean Jackson  <dino@apple.com>
 

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

@@ -867 +867 @@
     page->getWindowFrame(windowFrame);
 
-    x = std::max(std::min(0.0f, x), windowFrame.size().width());
-    y = std::max(std::min(0.0f, y), windowFrame.size().height());
+    x = std::min(std::max(0.0f, x), windowFrame.size().width());
+    y = std::min(std::max(0.0f, y + page->topContentInset()), windowFrame.size().height());
 
     WebCore::IntPoint viewPosition = WebCore::IntPoint(static_cast<int>(x), static_cast<int>(y));