[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Dec 22 18:49:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit eaba6c169093bbb8dbf2223c1752612003553e01
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 20 16:08:01 2010 +0000
2010-12-18 Antonio Gomes <agomes at rim.com>
Reviewed by Xan Lopez.
[GTK+] Simplify spatial navigation handling in EditorClientGtk.cpp
https://bugs.webkit.org/show_bug.cgi?id=51302
Patch changes:
1) The editor command for LEFT arrow key press without modifier
from MoveBackward to MoveLeft;
2) And similarly changes the editor command for RIGHT arrow key
press without modifier from MoveForward to MoveRight.
It has no implications since SelectionController::modifyMovingRight()
handles "MoveRight" equaly to how SelectionController::modifyMovingForward()
handles "MoveForward" when the granularity is 'CharacterGranularity'.
The former falls back to the later in the case of other editor commands.
Analogously, the same applies to how SelectionController::modifyMovingLeft() and
SelectionController::modifyMovingForward() handle "MoveLeft" and "MoveBackward"
editor commands, respectively.
With this change we can remove the spatial navigation hack from moveCursorCallback(),
in EditorClientGtk.cpp.
* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::moveCursorCallback):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74348 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 2feef54..bc13749 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,31 @@
+2010-12-18 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK+] Simplify spatial navigation handling in EditorClientGtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=51302
+
+ Patch changes:
+ 1) The editor command for LEFT arrow key press without modifier
+ from MoveBackward to MoveLeft;
+ 2) And similarly changes the editor command for RIGHT arrow key
+ press without modifier from MoveForward to MoveRight.
+
+ It has no implications since SelectionController::modifyMovingRight()
+ handles "MoveRight" equaly to how SelectionController::modifyMovingForward()
+ handles "MoveForward" when granularity is 'CharacterGranularity'. The former
+ falls back to the later in the case of other editor commands.
+
+ Analogously, the same applies to how SelectionController::modifyMovingLeft() and
+ SelectionController::modifyMovingForward() handle "MoveLeft" and "MoveBackward"
+ editor commands, respectively.
+
+ With this change we can remove the spatial navigation hack from moveCursorCallback(),
+ in EditorClientGtk.cpp.
+
+ * WebCoreSupport/EditorClientGtk.cpp:
+ (WebKit::moveCursorCallback):
+
2010-12-16 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
index 2a6cc87..0522f87 100644
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
@@ -198,7 +198,7 @@ static void deleteFromCursorCallback(GtkWidget* widget, GtkDeleteType deleteType
static const char* const gtkMoveCommands[][4] = {
{ "MoveBackward", "MoveForward",
"MoveBackwardAndModifySelection", "MoveForwardAndModifySelection" }, // Forward/backward grapheme
- { "MoveBackward", "MoveForward",
+ { "MoveLeft", "MoveRight",
"MoveBackwardAndModifySelection", "MoveForwardAndModifySelection" }, // Left/right grapheme
{ "MoveWordBackward", "MoveWordForward",
"MoveWordBackwardAndModifySelection", "MoveWordForwardAndModifySelection" }, // Forward/backward word
@@ -232,13 +232,6 @@ static void moveCursorCallback(GtkWidget* widget, GtkMovementStep step, gint cou
if (!rawCommand)
return;
- if (isSpatialNavigationEnabled(core(client->webView())->focusController()->focusedOrMainFrame()) && step == 1) {
- if (direction == 1)
- rawCommand = "MoveRight";
- else if (!direction)
- rawCommand = "MoveLeft";
- }
-
for (int i = 0; i < abs(count); i++)
client->addPendingEditorCommand(rawCommand);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list