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

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 48cfb3859b2ffccdd2789c5402a4d86670362633
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 16:16:16 2010 +0000

    [Gtk] Implement setSpatialNavigationEnabled in DRT.
    https://bugs.webkit.org/show_bug.cgi?id=35705
    
    Reviewed by Holger Freyther
    Patch by Antonio Gomes <tonikitoo at webkit.org>
    
    WebKitTools:
    
    * DumpRenderTree/gtk/DumpRenderTree.cpp:
    (resetDefaultsToConsistentValues):
    * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
    (LayoutTestController::setSpatialNavigationEnabled):
    
    LayoutTests:
    
    * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55585 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e6f1ada..6d1daae 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
 2010-03-03  Antonio Gomes  <tonikitoo at webkit.org>
 
+        Reviewed by Holger Freyther
+        Patch by Antonio Gomes <tonikitoo at webkit.org>
+
+        [Gtk] Implement setSpatialNavigationEnabled in DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=35705
+
+        * platform/gtk/Skipped:
+
+2010-03-03  Antonio Gomes  <tonikitoo at webkit.org>
+
         Reviewed by Kenneth Christiansen.
         Patch by Antonio Gomes <tonikitoo at webkit.org>
 
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 6b0b67b..30f077f 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5803,6 +5803,3 @@ fast/dom/Geolocation/permission-denied-already-error.html
 fast/dom/Geolocation/permission-denied-already-success.html
 fast/dom/Geolocation/permission-denied-stops-watches.html
 fast/dom/Geolocation/permission-denied.html
-
-# Need to add functionality to DumpRenderTree to handle enable/disable Spatial Navigation
-fast/events/spatial-navigation
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fa65c31..0efe694 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
 2010-03-02  Antonio Gomes  <tonikitoo at webkit.org>
 
+        Reviewed by Holger Freyther
+        Patch by Antonio Gomes <tonikitoo at webkit.org>
+
+        [Gtk] Implement setSpatialNavigationEnabled in DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=35705
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setSpatialNavigationEnabled):
+
+2010-02-23  Antonio Gomes  <tonikitoo at webkit.org>
+
         Reviewed by Kenneth Christiansen.
         Patch by Antonio Gomes <tonikitoo at webkit.org>
 
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 3ebad44..18ba2e7 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -319,6 +319,7 @@ static void resetDefaultsToConsistentValues()
                  "enable-html5-database", TRUE,
                  "enable-html5-local-storage", TRUE,
                  "enable-xss-auditor", FALSE,
+                 "enable-spatial-navigation", FALSE,
                  "javascript-can-open-windows-automatically", TRUE,
                  "enable-offline-web-application-cache", TRUE,
                  "enable-universal-access-from-file-uris", TRUE,
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 9b14ac4..3d0289e 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -341,7 +341,11 @@ void LayoutTestController::setFrameSetFlatteningEnabled(bool flag)
 
 void LayoutTestController::setSpatialNavigationEnabled(bool flag)
 {
-    // FIXME: implement
+    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+    ASSERT(view);
+
+    WebKitWebSettings* settings = webkit_web_view_get_settings(view);
+    g_object_set(G_OBJECT(settings), "enable-spatial-navigation", flag, NULL);
 }
 
 void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool flag)

-- 
WebKit Debian packaging