Attachment 72517 Details for Bug 48145 – fix patch 2

[patch] fix patch 2

48145_2.patch (text/plain), 4.48 KB, created by Chang Shu on 2010-11-01 09:54:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chang Shu

Created: 2010-11-01 09:54:31 PDT

Size: 4.48 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 71026)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2010-11-01  Chang Shu  <chang.shu@nokia.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Mario Sanchez Prada  <msanchez@igalia.com>
> 
>         Reviewed by Martin Robinson.
>Index: WebCore/dom/SelectElement.cpp
>===================================================================
>--- WebCore/dom/SelectElement.cpp	(revision 71026)
>+++ WebCore/dom/SelectElement.cpp	(working copy)
>@@ -762,7 +762,15 @@ void SelectElement::listBoxDefaultEventH
>             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);
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 71026)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2010-11-01  Chang Shu  <chang.shu@nokia.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Adam Roben  <aroben@apple.com>
> 
>         Add two more failing tests to the WebKit2 Skipped file
>Index: LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt
>===================================================================
>--- LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt	(revision 70519)
>+++ LayoutTests/fast/events/spatial-navigation/snav-multiple-select-expected.txt	(working copy)
>@@ -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"
>Index: LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html
>===================================================================
>--- LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html	(revision 70519)
>+++ LayoutTests/fast/events/spatial-navigation/snav-multiple-select.html	(working copy)
>@@ -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"],

Actions: View | Formatted Diff | Diff

Attachments on bug 48145: 72502 | 72517