[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

chang.shu at nokia.com chang.shu at nokia.com
Wed Dec 22 15:36:35 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 69109ab10a285813128fda52a1ea0bb865e15b04
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 05:23:50 2010 +0000

    2010-11-08  Chang Shu  <chang.shu at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            Unskip test that is passing now.
            https://bugs.webkit.org/show_bug.cgi?id=49150
    
            * platform/gtk/Skipped:
    2010-11-08  Chang Shu  <chang.shu at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            [GTK] Use Space to toggle arrow key handling for selection change or
            spatial navigation. Put the logic in common code to pass both Qt and
            GTK. Mac won't work because arrow keys trigger the popup.
            https://bugs.webkit.org/show_bug.cgi?id=49150
    
            Existing test: fast/events/spatial-navigation/snav-single-select.html
    
            * dom/SelectElement.cpp:
            (WebCore::SelectElement::menuListDefaultEventHandler):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 34ff531..288f612 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-08  Chang Shu  <chang.shu at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Unskip test that is passing now.
+        https://bugs.webkit.org/show_bug.cgi?id=49150
+
+        * platform/gtk/Skipped:
+
 2010-11-08  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed. Rebaselines for r71589.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 7c315f4..d82deba 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5678,9 +5678,6 @@ mathml/presentation
 # https://bugs.webkit.org/show_bug.cgi?id=49052
 fast/canvas/pointInPath.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=49176
-fast/events/spatial-navigation/snav-single-select.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=49177
 fast/events/scroll-after-click-on-tab-index.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a8390d7..4a86cb4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-08  Chang Shu  <chang.shu at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [GTK] Use Space to toggle arrow key handling for selection change or
+        spatial navigation. Put the logic in common code to pass both Qt and
+        GTK. Mac won't work because arrow keys trigger the popup.
+        https://bugs.webkit.org/show_bug.cgi?id=49150
+
+        Existing test: fast/events/spatial-navigation/snav-single-select.html
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::menuListDefaultEventHandler):
+
 2010-11-08  Jenn Braithwaite  <jennb at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index 886eee7..e79dd7d 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -605,6 +605,13 @@ void SelectElement::menuListDefaultEventHandler(SelectElementData& data, Element
         int keyCode = static_cast<KeyboardEvent*>(event)->keyCode();
         bool handled = false;
 
+        if (keyCode == ' ' && isSpatialNavigationEnabled(element->document()->frame())) {
+            // Use space to toggle arrow key handling for selection change or spatial navigation.
+            data.setActiveSelectionState(!data.activeSelectionState());
+            event->setDefaultHandled();
+            return;
+        }
+
 #if SPACE_OR_RETURN_POP_MENU
         if (keyCode == ' ' || keyCode == '\r') {
             element->focus();
@@ -644,10 +651,6 @@ void SelectElement::menuListDefaultEventHandler(SelectElementData& data, Element
             // listIndex should already be selected, but this will fire the onchange handler.
             setSelectedIndex(data, element, listToOptionIndex(data, element, listIndex), true, true);
             handled = true;
-        } else if (keyCode == ' ' && isSpatialNavigationEnabled(element->document()->frame())) {
-            // Use space to trigger arrow key handling for selection change or spatial navigation.
-            data.setActiveSelectionState(!data.activeSelectionState());
-            handled = true;
         }
 #endif
         if (handled)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list