<!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>[161558] 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/161558">161558</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-09 09:23:48 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cannot select multiple non-adjacent items in a multiple select control with the keyboard only
https://bugs.webkit.org/show_bug.cgi?id=15816
Patch by Pascal Jacquemart <p.jacquemart@samsung.com> on 2014-01-09
Reviewed by Chris Fleizach.
Source/WebCore:
Test: fast/forms/listbox-non-contiguous-keyboard-selection.html
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::HTMLSelectElement):
New member m_allowsNonContiguousSelection defaults to false
(WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
Tracking CTRL modifier to start multiple non contiguous selection
* html/HTMLSelectElement.h: New member m_allowsNonContiguousSelection
(WebCore::HTMLSelectElement::allowsNonContiguousSelection): New getter
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::addFocusRingRects):
Following implementation made for spatial navigation
LayoutTests:
* fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt: Added.
* fast/forms/listbox-non-contiguous-keyboard-selection.html: Added.
* platform/mac/TestExpectations:
Multiple non contiguous selection with keyboard not enabled on Mac</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformslistboxnoncontiguouskeyboardselectionexpectedtxt">trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformslistboxnoncontiguouskeyboardselectionhtml">trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161557 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-09 17:21:02 UTC (rev 161557)
+++ trunk/LayoutTests/ChangeLog 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-09 Pascal Jacquemart <p.jacquemart@samsung.com>
+
+ Cannot select multiple non-adjacent items in a multiple select control with the keyboard only
+ https://bugs.webkit.org/show_bug.cgi?id=15816
+
+ Reviewed by Chris Fleizach.
+
+ * fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt: Added.
+ * fast/forms/listbox-non-contiguous-keyboard-selection.html: Added.
+ * platform/mac/TestExpectations:
+ Multiple non contiguous selection with keyboard not enabled on Mac
+
</ins><span class="cx"> 2014-01-09 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused overriding protocols.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformslistboxnoncontiguouskeyboardselectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt (0 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<select> selection test for multiple but non contiguous selection with keyboard.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+1) Select multiple non-adjacent items with the keyboard
+PASS selectionPattern("sl1") is "01010"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformslistboxnoncontiguouskeyboardselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection.html (0 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection.html (rev 0)
+++ trunk/LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection.html 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description('&lt;select&gt; selection test for multiple but non contiguous selection with keyboard.');
+
+function keyDownOnSelect(selId, identifier, modifier) {
+ document.getElementById(selId).focus();
+ if (window.eventSender)
+ eventSender.keyDown(identifier, [modifier]);
+}
+
+function createSelect(idName, sz, mlt, selIndex) {
+ var sl = document.createElement("select");
+ var i = 0;
+ sl.size = sz;
+ while (i < sz) {
+ var opt = document.createElement("option");
+ if (i == selIndex)
+ opt.selected = true;
+ opt.textContent = "item " + i;
+ sl.appendChild(opt);
+ i++;
+ }
+ sl.multiple = mlt;
+ sl.id = idName;
+ var parent = document.getElementById("parent");
+ parent.appendChild(sl);
+}
+
+function selectionPattern(selId) {
+ var sl = document.getElementById(selId);
+ var result = '';
+ for (var i = 0; i < sl.options.length; i++)
+ result += sl.options[i].selected ? '1' : '0';
+ return result;
+}
+
+var parent = document.createElement('div');
+parent.id = "parent";
+document.body.appendChild(parent);
+
+createSelect("sl1", 5, true, -1);
+
+debug("1) Select multiple non-adjacent items with the keyboard");
+// Move to second item.
+keyDownOnSelect("sl1", "downArrow", "addSelectionKey");
+keyDownOnSelect("sl1", "downArrow", "addSelectionKey");
+// Select it.
+keyDownOnSelect("sl1", " ");
+// Move to fourth item.
+keyDownOnSelect("sl1", "downArrow", "addSelectionKey");
+keyDownOnSelect("sl1", "downArrow", "addSelectionKey");
+// Select it.
+keyDownOnSelect("sl1", " ");
+shouldBe('selectionPattern("sl1")', '"01010"');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (161557 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-01-09 17:21:02 UTC (rev 161557)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -565,6 +565,9 @@
</span><span class="cx"> fast/events/show-modal-dialog-onblur-onfocus.html
</span><span class="cx"> platform/mac/fast/forms/listbox-scrollbar-hit-test.html
</span><span class="cx">
</span><ins>+# Multiple non contiguous selection with keyboard not enabled on mac
+webkit.org/b/15816 fast/forms/listbox-non-contiguous-keyboard-selection.html [ Skip ]
+
</ins><span class="cx"> # <rdar://problem/11224894> Several Japanese vertical text tests failing on Mountain Lion
</span><span class="cx"> fast/dynamic/text-combine.html
</span><span class="cx"> fast/repaint/japanese-rl-selection-clear.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161557 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-09 17:21:02 UTC (rev 161557)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-09 Pascal Jacquemart <p.jacquemart@samsung.com>
+
+ Cannot select multiple non-adjacent items in a multiple select control with the keyboard only
+ https://bugs.webkit.org/show_bug.cgi?id=15816
+
+ Reviewed by Chris Fleizach.
+
+ Test: fast/forms/listbox-non-contiguous-keyboard-selection.html
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::HTMLSelectElement):
+ New member m_allowsNonContiguousSelection defaults to false
+ (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
+ Tracking CTRL modifier to start multiple non contiguous selection
+ * html/HTMLSelectElement.h: New member m_allowsNonContiguousSelection
+ (WebCore::HTMLSelectElement::allowsNonContiguousSelection): New getter
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::addFocusRingRects):
+ Following implementation made for spatial navigation
+
</ins><span class="cx"> 2014-01-09 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused overriding protocols.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (161557 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-01-09 17:21:02 UTC (rev 161557)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> , m_isProcessingUserDrivenChange(false)
</span><span class="cx"> , m_multiple(false)
</span><span class="cx"> , m_activeSelectionState(false)
</span><ins>+ , m_allowsNonContiguousSelection(false)
</ins><span class="cx"> , m_shouldRecalcListItems(false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(selectTag));
</span><span class="lines">@@ -1457,7 +1458,13 @@
</span><span class="cx"> ASSERT_UNUSED(listItems, !listItems.size() || static_cast<size_t>(endIndex) < listItems.size());
</span><span class="cx"> setActiveSelectionEndIndex(endIndex);
</span><span class="cx">
</span><del>- bool selectNewItem = !m_multiple || static_cast<KeyboardEvent*>(event)->shiftKey() || !isSpatialNavigationEnabled(document().frame());
</del><ins>+#if PLATFORM(MAC)
+ m_allowsNonContiguousSelection = m_multiple && isSpatialNavigationEnabled(document().frame());
+#else
+ m_allowsNonContiguousSelection = m_multiple && (isSpatialNavigationEnabled(document().frame()) || static_cast<KeyboardEvent*>(event)->ctrlKey());
+#endif
+ bool selectNewItem = static_cast<KeyboardEvent*>(event)->shiftKey() || !m_allowsNonContiguousSelection;
+
</ins><span class="cx"> if (selectNewItem)
</span><span class="cx"> m_activeSelectionState = true;
</span><span class="cx"> // If the anchor is unitialized, or if we're going to deselect all
</span><span class="lines">@@ -1487,7 +1494,7 @@
</span><span class="cx"> if (form())
</span><span class="cx"> form()->submitImplicitly(event, false);
</span><span class="cx"> event->setDefaultHandled();
</span><del>- } else if (m_multiple && keyCode == ' ' && isSpatialNavigationEnabled(document().frame())) {
</del><ins>+ } else if (m_multiple && keyCode == ' ' && m_allowsNonContiguousSelection) {
</ins><span class="cx"> // Use space to toggle selection change.
</span><span class="cx"> m_activeSelectionState = !m_activeSelectionState;
</span><span class="cx"> ASSERT(m_activeSelectionEndIndex >= 0
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (161557 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2014-01-09 17:21:02 UTC (rev 161557)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx">
</span><span class="cx"> // For use in the implementation of HTMLOptionElement.
</span><span class="cx"> void optionSelectionStateChanged(HTMLOptionElement*, bool optionIsSelected);
</span><ins>+ bool allowsNonContiguousSelection() const { return m_allowsNonContiguousSelection; };
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> HTMLSelectElement(const QualifiedName&, Document&, HTMLFormElement*);
</span><span class="lines">@@ -208,6 +209,7 @@
</span><span class="cx"> bool m_isProcessingUserDrivenChange;
</span><span class="cx"> bool m_multiple;
</span><span class="cx"> bool m_activeSelectionState;
</span><ins>+ bool m_allowsNonContiguousSelection;
</ins><span class="cx"> mutable bool m_shouldRecalcListItems;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (161557 => 161558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-01-09 17:21:02 UTC (rev 161557)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-01-09 17:23:48 UTC (rev 161558)
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
</span><span class="cx"> {
</span><del>- if (!isSpatialNavigationEnabled(&frame()))
</del><ins>+ if (!selectElement().allowsNonContiguousSelection())
</ins><span class="cx"> return RenderBlockFlow::addFocusRingRects(rects, additionalOffset, paintContainer);
</span><span class="cx">
</span><span class="cx"> // Focus the last selected item.
</span></span></pre>
</div>
</div>
</body>
</html>