<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207544] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207544">207544</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-19 10:46:42 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MouseEvent's coordinates should be 0 for simulated clicks
https://bugs.webkit.org/show_bug.cgi?id=163648
Reviewed by Darin Adler.
Source/WebCore:
MouseEvent's coordinates should be 0 / 0 for simulated clicks triggered
by JavaScript (i.e. via element.click()). This behavior matches Chrome
and Firefox.
WebKit was computing actual coordinates for the element which was
expensive, especially because computing screenX / screenY required
a synchronous IPC with the UI process.
Test: fast/events/element-click-no-coords.html
* dom/Element.cpp:
(WebCore::Element::dispatchSimulatedClick):
* dom/SimulatedClick.cpp:
(WebCore::simulateMouseEvent):
(WebCore::simulateClick):
* dom/SimulatedClick.h:
* html/HTMLElement.cpp:
(WebCore::HTMLElement::click):
LayoutTests:
Add layout test coverage. I verified that this test is passing in
Firefox and Chrome as well.
* fast/events/element-click-no-coords-expected.txt: Added.
* fast/events/element-click-no-coords.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSimulatedClickcpp">trunk/Source/WebCore/dom/SimulatedClick.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSimulatedClickh">trunk/Source/WebCore/dom/SimulatedClick.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventselementclicknocoordsexpectedtxt">trunk/LayoutTests/fast/events/element-click-no-coords-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventselementclicknocoordshtml">trunk/LayoutTests/fast/events/element-click-no-coords.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207543 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-19 17:40:27 UTC (rev 207543)
+++ trunk/LayoutTests/ChangeLog 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-19 Chris Dumez <cdumez@apple.com>
+
+ MouseEvent's coordinates should be 0 for simulated clicks
+ https://bugs.webkit.org/show_bug.cgi?id=163648
+
+ Reviewed by Darin Adler.
+
+ Add layout test coverage. I verified that this test is passing in
+ Firefox and Chrome as well.
+
+ * fast/events/element-click-no-coords-expected.txt: Added.
+ * fast/events/element-click-no-coords.html: Added.
+
</ins><span class="cx"> 2016-10-19 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: [Mac] Meter element should use AXValueDescription to descrbe the status of the value
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventselementclicknocoordsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/element-click-no-coords-expected.txt (0 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/element-click-no-coords-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/element-click-no-coords-expected.txt 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Tests that the MouseEvent's coordinates are 0 for a simulated click.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS event.screenX is 0
+PASS event.screenY is 0
+PASS event.clientX is 0
+PASS event.clientY is 0
+PASS event.pageX is 0
+PASS event.pageY is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Test Div
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventselementclicknocoordshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/element-click-no-coords.html (0 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/element-click-no-coords.html (rev 0)
+++ trunk/LayoutTests/fast/events/element-click-no-coords.html 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<div id="testDiv">Test Div</div>
+<script>
+description("Tests that the MouseEvent's coordinates are 0 for a simulated click.");
+jsTestIsAsync = true;
+
+var testDiv = document.getElementById("testDiv");
+
+testDiv.onclick = function(e) {
+ event = e;
+ shouldBe("event.screenX", "0");
+ shouldBe("event.screenY", "0");
+ shouldBe("event.clientX", "0");
+ shouldBe("event.clientY", "0");
+ shouldBe("event.pageX", "0");
+ shouldBe("event.pageY", "0");
+
+ finishJSTest();
+};
+
+testDiv.click();
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207543 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-19 17:40:27 UTC (rev 207543)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-10-19 Chris Dumez <cdumez@apple.com>
+
+ MouseEvent's coordinates should be 0 for simulated clicks
+ https://bugs.webkit.org/show_bug.cgi?id=163648
+
+ Reviewed by Darin Adler.
+
+ MouseEvent's coordinates should be 0 / 0 for simulated clicks triggered
+ by JavaScript (i.e. via element.click()). This behavior matches Chrome
+ and Firefox.
+
+ WebKit was computing actual coordinates for the element which was
+ expensive, especially because computing screenX / screenY required
+ a synchronous IPC with the UI process.
+
+ Test: fast/events/element-click-no-coords.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchSimulatedClick):
+ * dom/SimulatedClick.cpp:
+ (WebCore::simulateMouseEvent):
+ (WebCore::simulateClick):
+ * dom/SimulatedClick.h:
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::click):
+
</ins><span class="cx"> 2016-10-19 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix transform parsing
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (207543 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-10-19 17:40:27 UTC (rev 207543)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> void Element::dispatchSimulatedClick(Event* underlyingEvent, SimulatedClickMouseEventOptions eventOptions, SimulatedClickVisualOptions visualOptions)
</span><span class="cx"> {
</span><del>- simulateClick(*this, underlyingEvent, eventOptions, visualOptions, SimulatedClickCreationOptions::FromUserAgent);
</del><ins>+ simulateClick(*this, underlyingEvent, eventOptions, visualOptions, SimulatedClickSource::UserAgent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<Node> Element::cloneNodeInternal(Document& targetDocument, CloningOperation type)
</span></span></pre></div>
<a id="trunkSourceWebCoredomSimulatedClickcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SimulatedClick.cpp (207543 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SimulatedClick.cpp 2016-10-19 17:40:27 UTC (rev 207543)
+++ trunk/Source/WebCore/dom/SimulatedClick.cpp 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx">
</span><span class="cx"> class SimulatedMouseEvent final : public MouseEvent {
</span><span class="cx"> public:
</span><del>- static Ref<SimulatedMouseEvent> create(const AtomicString& eventType, DOMWindow* view, RefPtr<Event>&& underlyingEvent, Element& target)
</del><ins>+ static Ref<SimulatedMouseEvent> create(const AtomicString& eventType, DOMWindow* view, RefPtr<Event>&& underlyingEvent, Element& target, SimulatedClickSource source)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new SimulatedMouseEvent(eventType, view, WTFMove(underlyingEvent), target));
</del><ins>+ return adoptRef(*new SimulatedMouseEvent(eventType, view, WTFMove(underlyingEvent), target, source));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SimulatedMouseEvent(const AtomicString& eventType, DOMWindow* view, RefPtr<Event>&& underlyingEvent, Element& target)
</del><ins>+ SimulatedMouseEvent(const AtomicString& eventType, DOMWindow* view, RefPtr<Event>&& underlyingEvent, Element& target, SimulatedClickSource source)
</ins><span class="cx"> : MouseEvent(eventType, true, true, underlyingEvent ? underlyingEvent->timeStamp() : currentTime(), view, 0, 0, 0, 0, 0,
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx"> 0, 0,
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> false, false, false, false, 0, 0, 0, 0, 0, true)
</span><span class="cx"> {
</span><ins>+ if (source == SimulatedClickSource::Bindings)
+ setUntrusted();
+
</ins><span class="cx"> if (UIEventWithKeyState* keyStateEvent = findEventWithKeyState(underlyingEvent.get())) {
</span><span class="cx"> m_ctrlKey = keyStateEvent->ctrlKey();
</span><span class="cx"> m_altKey = keyStateEvent->altKey();
</span><span class="lines">@@ -63,7 +66,11 @@
</span><span class="cx"> MouseEvent& mouseEvent = downcast<MouseEvent>(*this->underlyingEvent());
</span><span class="cx"> m_screenLocation = mouseEvent.screenLocation();
</span><span class="cx"> initCoordinates(mouseEvent.clientLocation());
</span><del>- } else {
</del><ins>+ } else if (source == SimulatedClickSource::UserAgent) {
+ // If there is no underlying event, we only populate the coordinates for events coming
+ // from the user agent (e.g. accessibility). For those coming from JavaScript (e.g.
+ // (element.click()), the coordinates will be 0, similarly to Firefox and Chrome.
+ // Note that the call to screenRect() causes a synchronous IPC with the UI process.
</ins><span class="cx"> m_screenLocation = target.screenRect().center();
</span><span class="cx"> initCoordinates(LayoutPoint(target.clientRect().center()));
</span><span class="cx"> }
</span><span class="lines">@@ -71,15 +78,13 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void simulateMouseEvent(const AtomicString& eventType, Element& element, Event* underlyingEvent, SimulatedClickCreationOptions creationOptions)
</del><ins>+static void simulateMouseEvent(const AtomicString& eventType, Element& element, Event* underlyingEvent, SimulatedClickSource source)
</ins><span class="cx"> {
</span><del>- auto event = SimulatedMouseEvent::create(eventType, element.document().defaultView(), underlyingEvent, element);
- if (creationOptions == SimulatedClickCreationOptions::FromBindings)
- event.get().setUntrusted();
- EventDispatcher::dispatchEvent(&element, event.get());
</del><ins>+ auto event = SimulatedMouseEvent::create(eventType, element.document().defaultView(), underlyingEvent, element, source);
+ EventDispatcher::dispatchEvent(&element, event);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void simulateClick(Element& element, Event* underlyingEvent, SimulatedClickMouseEventOptions mouseEventOptions, SimulatedClickVisualOptions visualOptions, SimulatedClickCreationOptions creationOptions)
</del><ins>+void simulateClick(Element& element, Event* underlyingEvent, SimulatedClickMouseEventOptions mouseEventOptions, SimulatedClickVisualOptions visualOptions, SimulatedClickSource creationOptions)
</ins><span class="cx"> {
</span><span class="cx"> if (element.isDisabledFormControl())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoredomSimulatedClickh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SimulatedClick.h (207543 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SimulatedClick.h 2016-10-19 17:40:27 UTC (rev 207543)
+++ trunk/Source/WebCore/dom/SimulatedClick.h 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx"> class Element;
</span><span class="cx"> class Event;
</span><span class="cx">
</span><del>-enum class SimulatedClickCreationOptions {
- FromBindings,
- FromUserAgent
</del><ins>+enum class SimulatedClickSource {
+ Bindings,
+ UserAgent
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void simulateClick(Element&, Event* underlyingEvent, SimulatedClickMouseEventOptions, SimulatedClickVisualOptions, SimulatedClickCreationOptions);
</del><ins>+void simulateClick(Element&, Event* underlyingEvent, SimulatedClickMouseEventOptions, SimulatedClickVisualOptions, SimulatedClickSource);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (207543 => 207544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-10-19 17:40:27 UTC (rev 207543)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-10-19 17:46:42 UTC (rev 207544)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLElement::click()
</span><span class="cx"> {
</span><del>- simulateClick(*this, nullptr, SendNoEvents, DoNotShowPressedLook, SimulatedClickCreationOptions::FromBindings);
</del><ins>+ simulateClick(*this, nullptr, SendNoEvents, DoNotShowPressedLook, SimulatedClickSource::Bindings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLElement::accessKeyAction(bool sendMouseEvents)
</span></span></pre>
</div>
</div>
</body>
</html>