Changeset 71094 in webkit

Timestamp:

Nov 1, 2010 6:56:45 PM (13 years ago)

Author:

chang.shu@nokia.com

Message:

2010-11-01 Chang Shu <​chang.shu@nokia.com>

Reviewed by Antonio Gomes.

Leave SelectElement key handling without setting event default
handled when the selection reaches the boundary so focus can
move to neighbor nodes in spatial navigation.
​https://bugs.webkit.org/show_bug.cgi?id=48145

• fast/events/spatial-navigation/snav-multiple-select-expected.txt:
• fast/events/spatial-navigation/snav-multiple-select.html:

2010-11-01 Chang Shu <​chang.shu@nokia.com>

Reviewed by Antonio Gomes.

Leave SelectElement key handling without setting event default
handled when the selection reaches the boundary so focus can
move to neighbor nodes in spatial navigation.
​https://bugs.webkit.org/show_bug.cgi?id=48145

• dom/SelectElement.cpp: (WebCore::SelectElement::listBoxDefaultEventHandler):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/SelectElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-01  Chang Shu  <chang.shu@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Leave SelectElement key handling without setting event default
+        handled when the selection reaches the boundary so focus can 
+        move to neighbor nodes in spatial navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=48145
+
+        * fast/events/spatial-navigation/snav-multiple-select-expected.txt:
+        * fast/events/spatial-navigation/snav-multiple-select.html:
+
 2010-11-01  Dmitry Titov  <dimich@chromium.org>
 

trunk/LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt

@@ -2 +2 @@
 4               6
 8       
-FAIL gFocusedDocument.activeElement.getAttribute("id") should be 8. Was start.
 PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
-FAIL gFocusedDocument.activeElement.getAttribute("id") should be 2. Was start.
+PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
+PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
+PASS gFocusedDocument.activeElement.getAttribute("id") is "8"
+PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
+PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
+PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
+PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
 PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
 PASS gFocusedDocument.activeElement.getAttribute("id") is "6"

trunk/LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html

@@ -16 +16 @@
 
     var resultMap = [
+      ["Down", "start"],
+      ["Down", "start"],
+      ["Down", "start"],
       ["Down", "8"],
+      ["Up", "start"],
+      ["Up", "start"],
       ["Up", "start"],
       ["Up", "2"],

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-01  Chang Shu  <chang.shu@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Leave SelectElement key handling without setting event default
+        handled when the selection reaches the boundary so focus can 
+        move to neighbor nodes in spatial navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=48145
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::listBoxDefaultEventHandler):
+
 2010-11-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/dom/SelectElement.cpp

@@ -763 +763 @@
                 endIndex = previousSelectableListIndex(data, element, data.activeSelectionEndIndex());    
         }
-        
+
+        if (Frame* frame = element->document()->frame()) {
+            if (frame->settings() && frame->settings()->isSpatialNavigationEnabled()) {
+                // Check if the selection moves to the boundary.
+                if (keyIdentifier == "Left" || keyIdentifier == "Right" || ((keyIdentifier == "Down" || keyIdentifier == "Up") && endIndex == data.activeSelectionEndIndex()))
+                    return;
+            }
+        }
+
         if (keyIdentifier == "Down" || keyIdentifier == "Up") {
             // Save the selection so it can be compared to the new selection when dispatching change events immediately after making the new selection.