Title: [200274] trunk/Source/WebKit2
Revision
200274
Author
bb...@apple.com
Date
2016-04-29 18:14:39 -0700 (Fri, 29 Apr 2016)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (200273 => 200274)


--- trunk/Source/WebKit2/ChangeLog	2016-04-30 00:52:55 UTC (rev 200273)
+++ trunk/Source/WebKit2/ChangeLog	2016-04-30 01:14:39 UTC (rev 200274)
@@ -1,3 +1,17 @@
+2016-04-29  Brian Burg  <bb...@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  <d...@apple.com>
 
         RTL <select> popup menu is in the wrong location

Modified: trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp (200273 => 200274)


--- trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp	2016-04-30 00:52:55 UTC (rev 200273)
+++ trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp	2016-04-30 01:14:39 UTC (rev 200274)
@@ -866,8 +866,8 @@
     WebCore::FloatRect windowFrame;
     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));
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to