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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 77a4fc9a0bcb192e07ca66019861df14839cac08
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 20:54:47 2010 +0000

    WebCore: Make sure the defaultSpaceEventHandler does logical scrolling.
    
    Reviewed by Adam Roben.
    
    * page/EventHandler.cpp:
    (WebCore::EventHandler::defaultSpaceEventHandler):
    
    WebKit2: Remove the space behavior that I added.  It's covered in EventHandler in WebCore
    already for Windows.
    
    Reviewed by Adam Roben.
    
    * WebProcess/WebPage/win/WebPageWin.cpp:
    (WebKit::WebPage::performDefaultBehaviorForKeyEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 02c1af5..b441111 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-13  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Make sure the defaultSpaceEventHandler does logical scrolling.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::defaultSpaceEventHandler):
+
 2010-12-13  Matthew Delaney  <mdelaney at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 662fc6e..281498a 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -2719,8 +2719,8 @@ void EventHandler::defaultSpaceEventHandler(KeyboardEvent*)
 
 void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
 {
-    ScrollDirection direction = event->shiftKey() ? ScrollUp : ScrollDown;
-    if (scrollOverflow(direction, ScrollByPage)) {
+    ScrollLogicalDirection direction = event->shiftKey() ? ScrollBlockDirectionBackward : ScrollBlockDirectionForward;
+    if (logicalScrollOverflow(direction, ScrollByPage)) {
         event->setDefaultHandled();
         return;
     }
@@ -2729,7 +2729,7 @@ void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
     if (!view)
         return;
 
-    if (view->scroll(direction, ScrollByPage))
+    if (view->logicalScroll(direction, ScrollByPage))
         event->setDefaultHandled();
 }
 
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b685bb2..fba8581 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2010-12-13  David Hyatt  <hyatt at apple.com>
 
+        Reviewed by Adam Roben.
+
+        Remove the space behavior that I added.  It's covered in EventHandler in WebCore
+        already for Windows.
+
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::WebPage::performDefaultBehaviorForKeyEvent):
+
+2010-12-13  David Hyatt  <hyatt at apple.com>
+
         Reviewed by Sam Weinig.
 
         https://bugs.webkit.org/show_bug.cgi?id=48545, Home/End, PageUp/PageDwn should respect writing-mode.  Use
diff --git a/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp b/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
index 9027b58..bc3b131 100644
--- a/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
+++ b/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
@@ -205,9 +205,6 @@ bool WebPage::performDefaultBehaviorForKeyEvent(const WebKeyboardEvent& keyboard
         else
             m_page->goBack();
         break;
-    case VK_SPACE:
-        logicalScroll(m_page.get(), keyboardEvent.shiftKey() ? ScrollBlockDirectionBackward : ScrollBlockDirectionForward, ScrollByPage);
-        break;
     case VK_LEFT:
         scroll(m_page.get(), ScrollLeft, ScrollByLine);
         break;

-- 
WebKit Debian packaging