[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c8f37f49da3d6e20d7feddff2040ebfa3cab3cda
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 21:26:02 2009 +0000

    2009-12-17  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Eric Seidel.
    
            Added the key WebKitEnableCaretBrowsing to the
            layoutTestController.overridePreference in order to activate caret
            browsing.
            https://bugs.webkit.org/show_bug.cgi?id=32612
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp: Added the reset value of
            the setting.
            * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: Inserted the new
            key in the keytable.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52284 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6a2dc9e..c43d91f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-17  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        Added the key WebKitEnableCaretBrowsing to the
+        layoutTestController.overridePreference in order to activate caret
+        browsing.
+        https://bugs.webkit.org/show_bug.cgi?id=32612
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp: Added the reset value of
+        the setting.
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: Inserted the new
+        key in the keytable.
+
 2009-12-17  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index fd1e3c6..5a5e9aa 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -333,6 +333,7 @@ static void resetDefaultsToConsistentValues()
                  "default-font-size", 16,
                  "default-monospace-font-size", 13,
                  "minimum-font-size", 1,
+                 "enable-caret-browsing", FALSE,
                  NULL);
 
     webkit_web_frame_clear_main_frame_name(mainFrame);
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 6e94c1c..d7d7ad1 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -68,6 +68,7 @@ static gchar* copyWebSettingKey(gchar* preferenceKey)
         keyTable = g_hash_table_new(g_str_hash, g_str_equal);
         g_hash_table_insert(keyTable, g_strdup("WebKitJavaScriptEnabled"), g_strdup("enable-scripts"));
         g_hash_table_insert(keyTable, g_strdup("WebKitDefaultFontSize"), g_strdup("default-font-size"));
+        g_hash_table_insert(keyTable, g_strdup("WebKitEnableCaretBrowsing"), g_strdup("enable-caret-browsing"));
     }
 
     return g_strdup(static_cast<gchar*>(g_hash_table_lookup(keyTable, preferenceKey)));

-- 
WebKit Debian packaging