Changeset 71388 in webkit

Timestamp:

Nov 4, 2010 9:31:22 PM (13 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-10-20 Chang Shu <​chang.shu@nokia.com>, Antonio Gomes <​tonikitoo@webkit.org>

Reviewed by Simon Fraser.

Spatial Navigation: add support to <input type=text> and <textarea>
​https://bugs.webkit.org/show_bug.cgi?id=37153

Before this patch, the focus cannot move away from input box once it is in. This patch allows focus
move to neighbor nodes when the caret reaches the edge of the texts. This patch does not support yet
cases where the focused <input> has a JS handler for the arrow keys.

WebCore:

Tests: fast/events/spatial-navigation/snav-input.html
fast/events/spatial-navigation/snav-textarea.html

• editing/EditorCommand.cpp: (WebCore::executeMoveDown): (WebCore::executeMoveLeft): (WebCore::executeMoveRight): (WebCore::executeMoveUp):
• editing/SelectionController.cpp: (WebCore::SelectionController::modify):

WebKit/qt:

• WebCoreSupport/EditorClientQt.cpp: WebCore::EditorClientQt::handleKeyboardEvent):

LayoutTests:

• fast/events/spatial-navigation/snav-input-expected.txt: Added.
• fast/events/spatial-navigation/snav-input.html: Added.
• fast/events/spatial-navigation/snav-textarea-expected.txt: Added.
• fast/events/spatial-navigation/snav-textarea.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/spatial-navigation/snav-input-expected.txt (added)
• LayoutTests/fast/events/spatial-navigation/snav-input.html (added)
• LayoutTests/fast/events/spatial-navigation/snav-textarea-expected.txt (added)
• LayoutTests/fast/events/spatial-navigation/snav-textarea.html (added)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/EditorCommand.cpp (modified) (4 diffs)
• WebCore/editing/SelectionController.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/EditorClientQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-20  Chang Shu  <chang.shu@nokia.com>, Antonio Gomes <tonikitoo@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        [Qt] Makes <input type=text> and <textarea> functional with
+        Spatial Navigation enabled. Before this patch, the focus cannot
+        move away from input box once it is in. This patch allows focus
+        move to neighbor nodes when the caret reaches the edge of the texts.
+        This patch does not support yet cases where the focused <input>
+        has a JS handler for the arrow keys.
+        https://bugs.webkit.org/show_bug.cgi?id=37153
+
+        * fast/events/spatial-navigation/snav-input-expected.txt: Added.
+        * fast/events/spatial-navigation/snav-input.html: Added.
+        * fast/events/spatial-navigation/snav-textarea-expected.txt: Added.
+        * fast/events/spatial-navigation/snav-textarea.html: Added.
+
 2010-11-04  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -4967 +4967 @@
 fast/loader/crash-copying-backforwardlist.html
 
+# Spatial Navigation
 # https://bugs.webkit.org/show_bug.cgi?id=47587
 fast/events/spatial-navigation/snav-iframe-flattening-simple.html
+# https://bugs.webkit.org/show_bug.cgi?id=49056
+fast/events/spatial-navigation/snav-input.html
+fast/events/spatial-navigation/snav-textarea.html
 
 # Implement LayoutTestController::callShouldCloseOnWebView()

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-20  Chang Shu  <chang.shu@nokia.com>, Antonio Gomes <tonikitoo@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        [Qt] Makes <input type=text> and <textarea> functional with
+        Spatial Navigation enabled. Before this patch, the focus cannot
+        move away from input box once it is in. This patch allows focus
+        move to neighbor nodes when the caret reaches the edge of the texts.
+        This patch does not support yet cases where the focused <input>
+        has a JS handler for the arrow keys.
+        https://bugs.webkit.org/show_bug.cgi?id=37153
+
+        Tests: fast/events/spatial-navigation/snav-input.html
+               fast/events/spatial-navigation/snav-textarea.html
+
+        * editing/EditorCommand.cpp:
+        (WebCore::executeMoveDown):
+        (WebCore::executeMoveLeft):
+        (WebCore::executeMoveRight):
+        (WebCore::executeMoveUp):
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::modify):
+
 2010-11-04  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/editing/EditorCommand.cpp

@@ -619 +619 @@
 static bool executeMoveDown(Frame* frame, Event*, EditorCommandSource, const String&)
 {
-    frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, LineGranularity, true);
-    return true;
+    return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionForward, LineGranularity, true);
 }
 
@@ -643 +642 @@
 static bool executeMoveLeft(Frame* frame, Event*, EditorCommandSource, const String&)
 {
-    frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionLeft, CharacterGranularity, true);
-    return true;
+    return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionLeft, CharacterGranularity, true);
 }
 
@@ -687 +685 @@
 static bool executeMoveRight(Frame* frame, Event*, EditorCommandSource, const String&)
 {
-    frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionRight, CharacterGranularity, true);
-    return true;
+    return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionRight, CharacterGranularity, true);
 }
 
@@ -807 +804 @@
 static bool executeMoveUp(Frame* frame, Event*, EditorCommandSource, const String&)
 {
-    frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, LineGranularity, true);
-    return true;
+    return frame->selection()->modify(SelectionController::AlterationMove, SelectionController::DirectionBackward, LineGranularity, true);
 }
 

trunk/WebCore/editing/SelectionController.cpp

@@ -643 +643 @@
     willBeModified(alter, direction);
 
+    bool wasRange = m_selection.isRange();
+    Position originalStartPosition = m_selection.start();
     VisiblePosition position;
     switch (direction) {
@@ -673 +675 @@
     if (position.isNull())
         return false;
+
+    if (m_frame && m_frame->settings() && m_frame->settings()->isSpatialNavigationEnabled())
+        if (!wasRange && alter == AlterationMove && position == originalStartPosition)
+            return false;
 
     // Some of the above operations set an xPosForVerticalArrowNavigation.

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-20  Chang Shu  <chang.shu@nokia.com>, Antonio Gomes <tonikitoo@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        [Qt] Makes <input type=text> and <textarea> functional with
+        Spatial Navigation enabled. Before this patch, the focus cannot
+        move away from input box once it is in. This patch allows focus
+        move to neighbor nodes when the caret reaches the edge of the texts.
+        This patch does not support yet cases where the focused <input>
+        has a JS handler for the arrow keys.
+        https://bugs.webkit.org/show_bug.cgi?id=37153
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleKeyboardEvent):
+
 2010-11-04  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

@@ -47 +47 @@
 #include "QWebPageClient.h"
 #include "Range.h"
+#include "Settings.h"
 #include "WindowsKeyboardCodes.h"
 #include "qwebpage.h"
@@ -361 +362 @@
     // FIXME: refactor all of this to use Actions or something like them
     if (start->isContentEditable()) {
+        bool doSpatialNavigation = false;
+        if (frame->settings() && frame->settings()->isSpatialNavigationEnabled()) {
+            if (!kevent->modifiers()) {
+                switch (kevent->windowsVirtualKeyCode()) {
+                case VK_LEFT:
+                case VK_RIGHT:
+                case VK_UP:
+                case VK_DOWN:
+                    doSpatialNavigation = true;
+                }
+            }
+        }
 #ifndef QT_NO_SHORTCUT
         QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent());
-        if (action != QWebPage::NoWebAction) {
+        if (action != QWebPage::NoWebAction && !doSpatialNavigation) {
             const char* cmd = QWebPagePrivate::editorCommandForWebActions(action);
             // WebKit doesn't have enough information about mode to decide how commands that just insert text if executed via Editor should be treated,
@@ -387 +400 @@
             if (kevent->shiftKey())
                 frame->editor()->command("MoveLeftAndModifySelection").execute();
-            else
-                frame->editor()->command("MoveLeft").execute();
+            else if (!frame->editor()->command("MoveLeft").execute())
+                return;
             break;
         case VK_RIGHT:
             if (kevent->shiftKey())
                 frame->editor()->command("MoveRightAndModifySelection").execute();
-            else
-                frame->editor()->command("MoveRight").execute();
+            else if (!frame->editor()->command("MoveRight").execute())
+                return;
             break;
         case VK_UP:
             if (kevent->shiftKey())
                 frame->editor()->command("MoveUpAndModifySelection").execute();
-            else
-                frame->editor()->command("MoveUp").execute();
+            else if (!frame->editor()->command("MoveUp").execute())
+                return;
             break;
         case VK_DOWN:
             if (kevent->shiftKey())
                 frame->editor()->command("MoveDownAndModifySelection").execute();
-            else
-                frame->editor()->command("MoveDown").execute();
+            else if (!frame->editor()->command("MoveDown").execute())
+                return;
             break;
         case VK_PRIOR: // PageUp