[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:22:08 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 82960c57d95e8c43f46811599434ab086288472b
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 01:56:45 2010 +0000

    2010-11-01  Chang Shu  <chang.shu at 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 at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2e203a1..d944b80 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-01  Chang Shu  <chang.shu at 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 at chromium.org>
 
         [Chromium] Unreviewed update of test expectations.
diff --git a/LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt b/LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt
index 9d52250..d476b73 100644
--- a/LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt
+++ b/LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt
@@ -1,9 +1,14 @@
 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"
 PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
diff --git a/LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html b/LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html
index 36c5295..700c2b6 100644
--- a/LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html
+++ b/LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html
@@ -15,8 +15,13 @@
     <script type="application/javascript">
 
     var resultMap = [
+      ["Down", "start"],
+      ["Down", "start"],
+      ["Down", "start"],
       ["Down", "8"],
       ["Up", "start"],
+      ["Up", "start"],
+      ["Up", "start"],
       ["Up", "2"],
       ["Down", "start"],
       ["Right", "6"],
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2ab813..4f43e58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-01  Chang Shu  <chang.shu at 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 at gmail.com>
 
         Unreviewed, rolling out r71080.
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index 57fb277..3023668 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -762,7 +762,15 @@ void SelectElement::listBoxDefaultEventHandler(SelectElementData& data, Element*
             else if (keyIdentifier == "Up")
                 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.
             saveLastSelection(data, element);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list