Changeset 69078 in webkit

Timestamp:

Oct 4, 2010 10:43:54 PM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

2010-10-04 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Antonio Gomes.

Spatial Navigation: Add support for <input type="radio">
​https://bugs.webkit.org/show_bug.cgi?id=46993

• fast/events/spatial-navigation/snav-radio-expected.txt: Added.
• fast/events/spatial-navigation/snav-radio-group-expected.txt: Added.
• fast/events/spatial-navigation/snav-radio-group.html: Added.
• fast/events/spatial-navigation/snav-radio.html: Added.

2010-10-04 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Antonio Gomes.

Spatial Navigation: Add support for <input type="radio">
​https://bugs.webkit.org/show_bug.cgi?id=46993

When using Spatial Navigation, every radio button should be focusable and
users should be able to navigate from one button to the next without moving the selection.

Tests: fast/events/spatial-navigation/snav-radio-group.html

fast/events/spatial-navigation/snav-radio.html

• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::isKeyboardFocusable): Every radio button should be keyboard focusable, if using Spatial Navigation. (WebCore::HTMLInputElement::defaultEventHandler): Disable the algorithm for selecting the next radio button within a group, if using Spatial Navigation.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/spatial-navigation/snav-radio-expected.txt (added)
• LayoutTests/fast/events/spatial-navigation/snav-radio-group-expected.txt (added)
• LayoutTests/fast/events/spatial-navigation/snav-radio-group.html (added)
• LayoutTests/fast/events/spatial-navigation/snav-radio.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-04  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Spatial Navigation: Add support for <input type="radio">
+        https://bugs.webkit.org/show_bug.cgi?id=46993
+
+        * fast/events/spatial-navigation/snav-radio-expected.txt: Added.
+        * fast/events/spatial-navigation/snav-radio-group-expected.txt: Added.
+        * fast/events/spatial-navigation/snav-radio-group.html: Added.
+        * fast/events/spatial-navigation/snav-radio.html: Added.
+
 2010-10-04  Renata Hodovan  <reni@inf.u-szeged.hu>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-04  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Spatial Navigation: Add support for <input type="radio">
+        https://bugs.webkit.org/show_bug.cgi?id=46993
+
+        When using Spatial Navigation, every radio button should be focusable and 
+        users should be able to navigate from one button to the next without moving the selection. 
+
+        Tests: fast/events/spatial-navigation/snav-radio-group.html
+               fast/events/spatial-navigation/snav-radio.html
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::isKeyboardFocusable):
+        Every radio button should be keyboard focusable, if using Spatial Navigation.
+        (WebCore::HTMLInputElement::defaultEventHandler):
+        Disable the algorithm for selecting the next radio button within a group, if using Spatial Navigation.
+
 2010-10-04  Renata Hodovan  <reni@inf.u-szeged.hu>
 

trunk/WebCore/html/HTMLInputElement.cpp

@@ -66 +66 @@
 #include "RenderTheme.h"
 #include "ScriptEventListener.h"
+#include "Settings.h"
 #include "StepRange.h"
 #include "TextEvent.h"
@@ -768 +769 @@
 
     if (deprecatedInputType() == RADIO) {
+        // When using Spatial Navigation, every radio button should be focusable.
+        if (document()->frame() && document()->frame()->settings() && document()->frame()->settings()->isSpatialNavigationEnabled())
+            return true;
 
         // Never allow keyboard tabbing to leave you in the same radio group.  Always
@@ -2261 +2265 @@
             // Tested in WinIE, and even for RTL, left still means previous radio button (and so moves
             // to the right).  Seems strange, but we'll match it.
-            bool forward = (key == "Down" || key == "Right");
-            
-            // We can only stay within the form's children if the form hasn't been demoted to a leaf because
-            // of malformed HTML.
-            Node* n = this;
-            while ((n = (forward ? n->traverseNextNode() : n->traversePreviousNode()))) {
-                // Once we encounter a form element, we know we're through.
-                if (n->hasTagName(formTag))
-                    break;
-                    
-                // Look for more radio buttons.
-                if (n->hasTagName(inputTag)) {
-                    HTMLInputElement* elt = static_cast<HTMLInputElement*>(n);
-                    if (elt->form() != form())
+            // However, when using Spatial Navigation, we need to be able to navigate without changing the selection.
+            if (!document()->frame() || !document()->frame()->settings() || !document()->frame()->settings()->isSpatialNavigationEnabled()) {
+                bool forward = (key == "Down" || key == "Right");
+
+                // We can only stay within the form's children if the form hasn't been demoted to a leaf because
+                // of malformed HTML.
+                Node* n = this;
+                while ((n = (forward ? n->traverseNextNode() : n->traversePreviousNode()))) {
+                    // Once we encounter a form element, we know we're through.
+                    if (n->hasTagName(formTag))
                         break;
+
+                    // Look for more radio buttons.
                     if (n->hasTagName(inputTag)) {
-                        HTMLInputElement* inputElt = static_cast<HTMLInputElement*>(n);
-                        if (inputElt->deprecatedInputType() == RADIO && inputElt->name() == name() && inputElt->isFocusable()) {
-                            inputElt->setChecked(true);
-                            document()->setFocusedNode(inputElt);
-                            inputElt->dispatchSimulatedClick(evt, false, false);
-                            evt->setDefaultHandled();
+                        HTMLInputElement* elt = static_cast<HTMLInputElement*>(n);
+                        if (elt->form() != form())
                             break;
+                        if (n->hasTagName(inputTag)) {
+                            HTMLInputElement* inputElt = static_cast<HTMLInputElement*>(n);
+                            if (inputElt->deprecatedInputType() == RADIO && inputElt->name() == name() && inputElt->isFocusable()) {
+                                inputElt->setChecked(true);
+                                document()->setFocusedNode(inputElt);
+                                inputElt->dispatchSimulatedClick(evt, false, false);
+                                evt->setDefaultHandled();
+                                break;
+                            }
                         }
                     }