<!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>[175263] 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/175263">175263</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-28 11:05:30 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Abandoned select option is reselected when shift selecting new options
https://bugs.webkit.org/show_bug.cgi?id=137553
Patch by Pascal Jacquemart <p.jacquemart@samsung.com> on 2014-10-28
Reviewed by Ryosuke Niwa.
Source/WebCore:
Previous active selection is wrongly recorded by HTMLSelectElement after selecting a new item using
typeAhead. Fixed by clearing previously selected options before starting a new active selection.
Test: fast/forms/listbox-selection-after-typeahead.html
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::selectOption): Code re-ordering
LayoutTests:
Test checking a combination of mouse and keyboard selection events
on select-multiple element
* fast/forms/listbox-selection-after-typeahead-expected.txt: Added.
* fast/forms/listbox-selection-after-typeahead.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="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformslistboxselectionaftertypeaheadexpectedtxt">trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformslistboxselectionaftertypeaheadhtml">trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175262 => 175263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-28 18:01:32 UTC (rev 175262)
+++ trunk/LayoutTests/ChangeLog 2014-10-28 18:05:30 UTC (rev 175263)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-28 Pascal Jacquemart <p.jacquemart@samsung.com>
+
+ Abandoned select option is reselected when shift selecting new options
+ https://bugs.webkit.org/show_bug.cgi?id=137553
+
+ Reviewed by Ryosuke Niwa.
+
+ Test checking a combination of mouse and keyboard selection events
+ on select-multiple element
+
+ * fast/forms/listbox-selection-after-typeahead-expected.txt: Added.
+ * fast/forms/listbox-selection-after-typeahead.html: Added.
+
</ins><span class="cx"> 2014-10-28 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Speed up line parsing for simple line layout.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformslistboxselectionaftertypeaheadexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead-expected.txt (0 => 175263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead-expected.txt 2014-10-28 18:05:30 UTC (rev 175263)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test checking if active selection is cleared after type ahead
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mouseDownAtOption(1); bitPatternForSelectedOptions() is "0100000"
+PASS sendkeyDown("5"); bitPatternForSelectedOptions() is "0000010"
+PASS sendkeyDown("upArrow", "shiftKey"); bitPatternForSelectedOptions() is "0000110"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformslistboxselectionaftertypeaheadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead.html (0 => 175263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead.html (rev 0)
+++ trunk/LayoutTests/fast/forms/listbox-selection-after-typeahead.html 2014-10-28 18:05:30 UTC (rev 175263)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<select id="listbox" size="7" multiple style="border:none; margin:0px; padding:0px; width:100px;">
+ <option>0</option>
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ <option>4</option>
+ <option>5</option>
+ <option>6</option>
+</select>
+<script>
+var select = document.getElementById('listbox');
+
+function mouseDownAtOption(index)
+{
+ var itemHeight = Math.floor(select.offsetHeight / select.size);
+ var posX = select.offsetLeft + select.offsetWidth / 2;
+ var posY = select.offsetTop + index * itemHeight + itemHeight / 2;
+ eventSender.mouseMoveTo(posX, posY);
+ eventSender.mouseDown();
+}
+
+function sendkeyDown(identifier, modifier) {
+ if (window.eventSender)
+ eventSender.keyDown(identifier, [modifier]);
+}
+
+function bitPatternForSelectedOptions()
+{
+ var result = "";
+ for (var i = 0; i < select.options.length; ++i)
+ result += select.options[i].selected ? '1' : '0';
+ return result;
+}
+
+description('Test checking if active selection is cleared after type ahead');
+
+shouldBeEqualToString('mouseDownAtOption(1); bitPatternForSelectedOptions()', "0100000");
+shouldBeEqualToString('sendkeyDown("5"); bitPatternForSelectedOptions()', "0000010");
+shouldBeEqualToString('sendkeyDown("upArrow", "shiftKey"); bitPatternForSelectedOptions()', "0000110");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175262 => 175263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-28 18:01:32 UTC (rev 175262)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 18:05:30 UTC (rev 175263)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-28 Pascal Jacquemart <p.jacquemart@samsung.com>
+
+ Abandoned select option is reselected when shift selecting new options
+ https://bugs.webkit.org/show_bug.cgi?id=137553
+
+ Reviewed by Ryosuke Niwa.
+
+ Previous active selection is wrongly recorded by HTMLSelectElement after selecting a new item using
+ typeAhead. Fixed by clearing previously selected options before starting a new active selection.
+
+ Test: fast/forms/listbox-selection-after-typeahead.html
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::selectOption): Code re-ordering
+
</ins><span class="cx"> 2014-10-28 Milan Crha <mcrha@redhat.com>
</span><span class="cx">
</span><span class="cx"> Use constants from wtf/MathExtras.h
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (175262 => 175263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-10-28 18:01:32 UTC (rev 175262)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-10-28 18:05:30 UTC (rev 175263)
</span><span class="lines">@@ -876,18 +876,19 @@
</span><span class="cx"> HTMLElement* element = nullptr;
</span><span class="cx"> if (listIndex >= 0) {
</span><span class="cx"> element = items[listIndex];
</span><del>- if (is<HTMLOptionElement>(*element)) {
- if (m_activeSelectionAnchorIndex < 0 || shouldDeselect)
- setActiveSelectionAnchorIndex(listIndex);
- if (m_activeSelectionEndIndex < 0 || shouldDeselect)
- setActiveSelectionEndIndex(listIndex);
- downcast<HTMLOptionElement>(*element).setSelectedState(true);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldDeselect)
</span><span class="cx"> deselectItemsWithoutValidation(element);
</span><span class="cx">
</span><ins>+ if (is<HTMLOptionElement>(element)) {
+ if (m_activeSelectionAnchorIndex < 0 || shouldDeselect)
+ setActiveSelectionAnchorIndex(listIndex);
+ if (m_activeSelectionEndIndex < 0 || shouldDeselect)
+ setActiveSelectionEndIndex(listIndex);
+ downcast<HTMLOptionElement>(*element).setSelectedState(true);
+ }
+
</ins><span class="cx"> // For the menu list case, this is what makes the selected element appear.
</span><span class="cx"> if (auto* renderer = this->renderer())
</span><span class="cx"> renderer->updateFromElement();
</span></span></pre>
</div>
</div>
</body>
</html>