<!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>[160337] 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/160337">160337</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-09 15:44:19 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/136280">r136280</a>): input[type=image] should assume coords of 0,0 when activated without physically clicking
https://bugs.webkit.org/show_bug.cgi?id=125392
Reviewed by Darin Adler.
Source/WebCore:
Merge https://chromium.googlesource.com/chromium/blink/+/3c33d42207cd209bb171083ba66c225f694f2101
Activating an image button with the keyboard or element.click() should result in selected coords of (0,0) per
http://www.w3.org/TR/2013/CR-html5-20130806/forms.html#image-button-state-(type=image)
"If the user activates the control without explicitly selecting a coordinate, then the coordinate (0,0) must be assumed."
New behavior also matches that of Internet Explorer and Firefox.
Tests: fast/forms/input-image-submit.html
* html/ImageInputType.cpp:
(WebCore::ImageInputType::handleDOMActivateEvent): Set m_clickLocation to (0, 0) for simulated events.
LayoutTests:
* fast/events/stopPropagation-submit-expected.txt:
* fast/forms/input-image-submit.html:
* platform/gtk/fast/events/stopPropagation-submit-expected.txt: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsstopPropagationsubmitexpectedtxt">trunk/LayoutTests/fast/events/stopPropagation-submit-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsinputimagesubmithtml">trunk/LayoutTests/fast/forms/input-image-submit.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlImageInputTypecpp">trunk/Source/WebCore/html/ImageInputType.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformgtkfasteventsstopPropagationsubmitexpectedtxt">trunk/LayoutTests/platform/gtk/fast/events/stopPropagation-submit-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160336 => 160337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-09 23:36:56 UTC (rev 160336)
+++ trunk/LayoutTests/ChangeLog 2013-12-09 23:44:19 UTC (rev 160337)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r136280): input[type=image] should assume coords of 0,0 when activated without physically clicking
+ https://bugs.webkit.org/show_bug.cgi?id=125392
+
+ Reviewed by Darin Adler.
+
+ * fast/events/stopPropagation-submit-expected.txt:
+ * fast/forms/input-image-submit.html:
+ * platform/gtk/fast/events/stopPropagation-submit-expected.txt: Removed.
+
</ins><span class="cx"> 2013-12-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Add support for VideoPlaybackMetrics.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsstopPropagationsubmitexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/stopPropagation-submit-expected.txt (160336 => 160337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/stopPropagation-submit-expected.txt 2013-12-09 23:36:56 UTC (rev 160336)
+++ trunk/LayoutTests/fast/events/stopPropagation-submit-expected.txt 2013-12-09 23:44:19 UTC (rev 160337)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> PASS
</span><del>-?x=-8&y=-60
</del><ins>+?x=0&y=0
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsinputimagesubmithtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/input-image-submit.html (160336 => 160337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-image-submit.html 2013-12-09 23:36:56 UTC (rev 160336)
+++ trunk/LayoutTests/fast/forms/input-image-submit.html 2013-12-09 23:44:19 UTC (rev 160337)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> var query = window.location.search;
</span><span class="cx">
</span><span class="cx"> if (query.indexOf('state=') == -1) {
</span><del>- // Step 1: Normal submission with type=image
</del><ins>+ // Step 1a: Normal submission by mouse click with type=image
</ins><span class="cx"> state.value = 'normal';
</span><span class="cx"> image.dispatchEvent(clickEvent);
</span><span class="cx"> } else if (query.indexOf('state=normal') != -1) {
</span><span class="lines">@@ -70,6 +70,30 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Step 1b: Submission by element.click() method with type=image
+ state.value = 'click-method';
+ image.click();
+ } else if (query.indexOf('state=click-method') != -1) {
+ if (query.indexOf('image.x=0&image.y=0&image=value') == -1) {
+ failAndDone('Click method failed: ' + query);
+ return;
+ }
+
+ // Step 1c: Submission by keyboard activation with type=image
+ state.value = 'keyboard';
+ if (window.eventSender) {
+ image.focus();
+ eventSender.keyDown(' ');
+ } else {
+ failAndDone('This test requires eventSender');
+ return;
+ }
+ } else if (query.indexOf('state=keyboard') != -1) {
+ if (query.indexOf('image.x=0&image.y=0&image=value') == -1) {
+ failAndDone('Activating with keyboard failed: ' + query);
+ return;
+ }
+
</ins><span class="cx"> // Step 2: Change the type to text on 'submit' event
</span><span class="cx"> state.value = 'to-text-on-submit';
</span><span class="cx"> image.dispatchEvent(clickEvent);
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfasteventsstopPropagationsubmitexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/fast/events/stopPropagation-submit-expected.txt (160336 => 160337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fast/events/stopPropagation-submit-expected.txt 2013-12-09 23:36:56 UTC (rev 160336)
+++ trunk/LayoutTests/platform/gtk/fast/events/stopPropagation-submit-expected.txt 2013-12-09 23:44:19 UTC (rev 160337)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-PASS
-?x=-8&y=-58
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160336 => 160337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-09 23:36:56 UTC (rev 160336)
+++ trunk/Source/WebCore/ChangeLog 2013-12-09 23:44:19 UTC (rev 160337)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r136280): input[type=image] should assume coords of 0,0 when activated without physically clicking
+ https://bugs.webkit.org/show_bug.cgi?id=125392
+
+ Reviewed by Darin Adler.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/3c33d42207cd209bb171083ba66c225f694f2101
+
+ Activating an image button with the keyboard or element.click() should result in selected coords of (0,0) per
+ http://www.w3.org/TR/2013/CR-html5-20130806/forms.html#image-button-state-(type=image)
+ "If the user activates the control without explicitly selecting a coordinate, then the coordinate (0,0) must be assumed."
+
+ New behavior also matches that of Internet Explorer and Firefox.
+
+ Tests: fast/forms/input-image-submit.html
+
+ * html/ImageInputType.cpp:
+ (WebCore::ImageInputType::handleDOMActivateEvent): Set m_clickLocation to (0, 0) for simulated events.
+
</ins><span class="cx"> 2013-12-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Add support for VideoPlaybackMetrics.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageInputType.cpp (160336 => 160337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageInputType.cpp 2013-12-09 23:36:56 UTC (rev 160336)
+++ trunk/Source/WebCore/html/ImageInputType.cpp 2013-12-09 23:44:19 UTC (rev 160337)
</span><span class="lines">@@ -85,11 +85,17 @@
</span><span class="cx"> if (element->isDisabledFormControl() || !element->form())
</span><span class="cx"> return;
</span><span class="cx"> element->setActivatedSubmit(true);
</span><del>- if (event->underlyingEvent() && event->underlyingEvent()->isMouseEvent()) {
- MouseEvent* mouseEvent = static_cast<MouseEvent*>(event->underlyingEvent());
- m_clickLocation = IntPoint(mouseEvent->offsetX(), mouseEvent->offsetY());
- } else
- m_clickLocation = IntPoint();
</del><ins>+
+ m_clickLocation = IntPoint();
+ if (event->underlyingEvent()) {
+ Event& underlyingEvent = *event->underlyingEvent();
+ if (underlyingEvent.isMouseEvent()) {
+ MouseEvent& mouseEvent = toMouseEvent(underlyingEvent);
+ if (!mouseEvent.isSimulated())
+ m_clickLocation = IntPoint(mouseEvent.offsetX(), mouseEvent.offsetY());
+ }
+ }
+
</ins><span class="cx"> element->form()->prepareForSubmission(event); // Event handlers can run.
</span><span class="cx"> element->setActivatedSubmit(false);
</span><span class="cx"> event->setDefaultHandled();
</span></span></pre>
</div>
</div>
</body>
</html>