Changeset 161558 in webkit

Timestamp:

Jan 9, 2014 9:23:48 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection-expected.txt (added)
• LayoutTests/fast/forms/listbox-non-contiguous-keyboard-selection.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSelectElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLSelectElement.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderListBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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
+
 2014-01-09  Seokju Kwon  <seokju@webkit.org>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -566 +566 @@
 platform/mac/fast/forms/listbox-scrollbar-hit-test.html
 
+# Multiple non contiguous selection with keyboard not enabled on mac
+webkit.org/b/15816 fast/forms/listbox-non-contiguous-keyboard-selection.html [ Skip ]
+
 # <rdar://problem/11224894> Several Japanese vertical text tests failing on Mountain Lion
 fast/dynamic/text-combine.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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
+
 2014-01-09  Seokju Kwon  <seokju@webkit.org>
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -75 +75 @@
     , m_multiple(false)
     , m_activeSelectionState(false)
+    , m_allowsNonContiguousSelection(false)
     , m_shouldRecalcListItems(false)
 {
@@ -1458 +1459 @@
             setActiveSelectionEndIndex(endIndex);
 
-            bool selectNewItem = !m_multiple || static_cast<KeyboardEvent*>(event)->shiftKey() || !isSpatialNavigationEnabled(document().frame());
+#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;
+
             if (selectNewItem)
                 m_activeSelectionState = true;
@@ -1488 +1495 @@
                 form()->submitImplicitly(event, false);
             event->setDefaultHandled();
-        } else if (m_multiple && keyCode == ' ' && isSpatialNavigationEnabled(document().frame())) {
+        } else if (m_multiple && keyCode == ' ' && m_allowsNonContiguousSelection) {
             // Use space to toggle selection change.
             m_activeSelectionState = !m_activeSelectionState;

trunk/Source/WebCore/html/HTMLSelectElement.h

@@ -112 +112 @@
     // For use in the implementation of HTMLOptionElement.
     void optionSelectionStateChanged(HTMLOptionElement*, bool optionIsSelected);
+    bool allowsNonContiguousSelection() const { return m_allowsNonContiguousSelection; };
 
 protected:
@@ -209 +210 @@
     bool m_multiple;
     bool m_activeSelectionState;
+    bool m_allowsNonContiguousSelection;
     mutable bool m_shouldRecalcListItems;
 };

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -320 +320 @@
 void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
 {
-    if (!isSpatialNavigationEnabled(&frame()))
+    if (!selectElement().allowsNonContiguousSelection())
         return RenderBlockFlow::addFocusRingRects(rects, additionalOffset, paintContainer);