[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 14:28:10 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 3d4848808a9ce35455643684ea681509d8151365
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 10 14:23:49 2010 +0000

    This reverts commit http://trac.webkit.org/changeset/69465
    
    Debug statments that should not be committed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html b/LayoutTests/fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
index e5de818..39e53b4 100644
--- a/LayoutTests/fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
+++ b/LayoutTests/fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
@@ -65,18 +65,11 @@
 
     function step2()
     {
-      console.log(document.activeElement.getAttribute("id") + "");
-      console.log("log:" + document.body.scrollTop);
       shouldBeTrue(String(document.body.scrollTop != 0));
 
       // Then it scrolls down to the end of the page ...
-      if (window.eventSender) {
-        var onMacPlatform = navigator.userAgent.search(/\bMac OS X\b/) != -1;
-        if (onMacPlatform)
-          eventSender.keyDown("downArrow", ["metaKey"]);
-        else
-          eventSender.keyDown("end");
-      }
+      if (window.eventSender)
+        eventSender.keyDown("end");
 
       // And 'resultMap2' re-tries to move focus down.
       initTest(resultMap2, testCompleted);
@@ -94,10 +87,9 @@
     <script src="../js/resources/js-test-post.js"></script>
   </head>
   <body id="some-content" xmlns="http://www.w3.org/1999/xhtml">
-    <a id="start" href="#">Start</a>
-    <input type="button" value="test"></input>
+    <a id="start" href="a">Start</a>
     <div style='margin-top:100000000px'>
-        <a id="end" href="#">End</a>
+        <a id="end" href="a">End</a>
     </div>
     <div id="console"></div>
   </body>
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 1dd2b87..d3709fb 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -1002,19 +1002,16 @@ bool EventHandler::scrollRecursively(ScrollDirection direction, ScrollGranularit
     // The layout needs to be up to date to determine if we can scroll. We may be
     // here because of an onLoad event, in which case the final layout hasn't been performed yet.
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
-    printf("%s 1\n", __FUNCTION__);
     bool handled = scrollOverflow(direction, granularity, startingNode);
     if (!handled) {
         Frame* frame = m_frame;
         do {
-            printf("%s 2\n", __FUNCTION__);
             FrameView* view = frame->view();
             handled = view ? view->scroll(direction, granularity) : false;
             frame = frame->tree()->parent();
         } while (!handled && frame);
      }
 
-    printf("%s 3 %d\n", __FUNCTION__, handled);
     return handled;
 }
 
diff --git a/WebCore/page/SpatialNavigation.cpp b/WebCore/page/SpatialNavigation.cpp
index a49ed5d..40aa52b 100644
--- a/WebCore/page/SpatialNavigation.cpp
+++ b/WebCore/page/SpatialNavigation.cpp
@@ -470,7 +470,6 @@ bool scrollInDirection(Frame* frame, FocusDirection direction, const FocusCandid
     if (!candidate.isNull() && isScrollableContainerNode(candidate.enclosingScrollableBox))
         return frame->eventHandler()->scrollRecursively(scrollDirection, ScrollByLine, candidate.enclosingScrollableBox);
 
-    printf("%s", __FUNCTION__);
     return frame->eventHandler()->scrollRecursively(scrollDirection, ScrollByLine);
 }
 
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index 9a2c453..66dcb8a 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -340,11 +340,9 @@ void ScrollView::setScrollPosition(const IntPoint& scrollPoint)
 
 bool ScrollView::scroll(ScrollDirection direction, ScrollGranularity granularity)
 {
-    printf("%s \n", __FUNCTION__);
-    if (platformWidget()) {
-        printf("%s bleh\n", __FUNCTION__);
+    if (platformWidget())
         return platformScroll(direction, granularity);
-    }
+
     if (direction == ScrollUp || direction == ScrollDown) {
         if (m_verticalScrollbar)
             return m_verticalScrollbar->scroll(direction, granularity);
diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index 2ccf13e..ccfb632 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -365,7 +365,7 @@ static WebCacheModel cacheModelForMainBundle(void)
         [NSNumber numberWithBool:NO],   WebKitUsesProxiedOpenPanelPreferenceKey,
         [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitFrameFlatteningEnabledPreferenceKey,
-        [NSNumber numberWithBool:YES],   WebKitSpatialNavigationEnabledPreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitSpatialNavigationEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitDNSPrefetchingEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitFullScreenEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitMemoryInfoEnabledPreferenceKey,

-- 
WebKit Debian packaging

