[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Wed Apr 7 23:46:32 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 62eb405f6f2f19916a62b71e841f89043aecac23
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 13:20:04 2009 +0000

    Ensure that tabKeyCyclesThroughElements is true by default.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51108 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 49994dc..f6e054c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-18  Martin Robinson  <martin.james.robinson at gmail.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Tab key does not cycle through elements by default
+        https://bugs.webkit.org/show_bug.cgi?id=31505
+
+        Improve fast/events/keypress-insert-tab.html to test that the
+        TabKeyCyclesThroughElements setting is true by default and
+        toggles correctly.
+
+        * fast/events/keypress-insert-tab.html:
+
 2009-11-18  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/fast/events/keypress-insert-tab.html b/LayoutTests/fast/events/keypress-insert-tab.html
index 8baf00d..d2dae9b 100644
--- a/LayoutTests/fast/events/keypress-insert-tab.html
+++ b/LayoutTests/fast/events/keypress-insert-tab.html
@@ -1,20 +1,45 @@
 <html>
 <head>
     <script>
+    function focusElementAndPressTabKey(el)
+    {
+        el.focus();
+        if (window.eventSender)
+            eventSender.keyDown("\t");
+    }
+
     function test() {
-        if (window.layoutTestController) {
+
+        if (window.layoutTestController)
             layoutTestController.dumpAsText();
-            // Set this preference so the tab key will actually insert a tab character- like in Mail.
+
+        var el = document.getElementById('ta');
+
+        // Test that default setting is to cycle through elements.
+        // This tab key press should not insert a tab.
+        focusElementAndPressTabKey(el);
+        if (el.value != "")
+            return;
+
+        if (window.layoutTestController)
             layoutTestController.setTabKeyCyclesThroughElements(false);
-        }
-        var ta = document.getElementById('ta');
-        ta.focus();
-        if (window.eventSender) {
-            eventSender.keyDown("\t");
-        }
-        var res = document.getElementById('res');
-        if (ta.value == "\t")
-            res.innerHTML = "Test Passed";
+
+        // Test that activating the setting causes a tab character insertion.
+        focusElementAndPressTabKey(el);
+        if (el.value != "\t")
+            return;
+
+        // Set this preference so the tab key will actually insert a tab character- like in Mail.
+        if (window.layoutTestController)
+            layoutTestController.setTabKeyCyclesThroughElements(true);
+
+        // Test that deactivating the setting prevents a tab insertion.
+        el.value = "";
+        focusElementAndPressTabKey(el);
+        if (el.value != "")
+            return;
+
+        res.innerHTML = "Test Passed";
     }
     </script>
 </head>
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 392342f..ebae3a2 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-18  Martin Robinson  <martin.james.robinson at gmail.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Tab key does not cycle through elements by default
+        https://bugs.webkit.org/show_bug.cgi?id=31505
+
+        Ensure that WebKitWebSettings tab-key-cycles-through-elements
+        property is true by default with the G_PARAM_CONSTRUCT_FLAG.
+
+        * webkit/webkitwebsettings.cpp:
+        (webkit_web_settings_class_init):
+
 2009-11-18  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index b477e54..b2c72a2 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -684,7 +684,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
                                                          "Tab key cycles through elements",
                                                          "Whether the tab key cycles through elements on the page.",
                                                          TRUE,
-                                                         WEBKIT_PARAM_READWRITE));
+                                                         flags));
 
     g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));
 }

-- 
WebKit Debian packaging

