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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit baa2be31f8fe83a622c9c496255f79ad0cba390e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 15:54:38 2010 +0000

    2010-03-15  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Adler.
    
            option-pageup/down should move cursor on chromium mac
            https://bugs.webkit.org/show_bug.cgi?id=36108
    
            Remove waitUntilDone/notifyDone from the layout test, it's not needed
            and causes timeouts on failure.
    
            * editing/input/option-page-up-down.html:
    2010-03-15  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Adler.
    
            option-pageup/down should move cursor on chromium mac
            https://bugs.webkit.org/show_bug.cgi?id=36108
    
            * src/EditorClientImpl.cpp:
            (WebKit::):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f4d32f6..a8ba388 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-15  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        option-pageup/down should move cursor on chromium mac
+        https://bugs.webkit.org/show_bug.cgi?id=36108
+
+        Remove waitUntilDone/notifyDone from the layout test, it's not needed
+        and causes timeouts on failure.
+
+        * editing/input/option-page-up-down.html:
+
 2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Eric Carlson.
diff --git a/LayoutTests/editing/input/option-page-up-down.html b/LayoutTests/editing/input/option-page-up-down.html
index 6556a3a..86e54ea 100644
--- a/LayoutTests/editing/input/option-page-up-down.html
+++ b/LayoutTests/editing/input/option-page-up-down.html
@@ -1,8 +1,6 @@
 <script>
-if (window.layoutTestController) {
+if (window.layoutTestController)
     layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-}
 
 function runTest()
 {
@@ -36,9 +34,6 @@ function runTest()
         throw "cursor should be at line 1, not " + line;
 
     document.getElementById("results").innerText = "PASS";
-
-    if (window.layoutTestController)
-        window.layoutTestController.notifyDone();
 }
 </script>
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d929cf1..bbfe9c9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-15  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        option-pageup/down should move cursor on chromium mac
+        https://bugs.webkit.org/show_bug.cgi?id=36108
+
+        * src/EditorClientImpl.cpp:
+        (WebKit::):
+
 2010-03-13  Eric Roman  <eroman at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/chromium/src/EditorClientImpl.cpp b/WebKit/chromium/src/EditorClientImpl.cpp
index dff1edc..4ecdcf7 100644
--- a/WebKit/chromium/src/EditorClientImpl.cpp
+++ b/WebKit/chromium/src/EditorClientImpl.cpp
@@ -413,8 +413,10 @@ static const KeyDownEntry keyDownEntries[] = {
     { VKEY_DOWN,   0,                  "MoveDown"                             },
     { VKEY_DOWN,   ShiftKey,           "MoveDownAndModifySelection"           },
     { VKEY_NEXT,   ShiftKey,           "MovePageDownAndModifySelection"       },
+#if !OS(DARWIN)
     { VKEY_PRIOR,  0,                  "MovePageUp"                           },
     { VKEY_NEXT,   0,                  "MovePageDown"                         },
+#endif
     { VKEY_HOME,   0,                  "MoveToBeginningOfLine"                },
     { VKEY_HOME,   ShiftKey,
         "MoveToBeginningOfLineAndModifySelection"                             },
@@ -422,6 +424,8 @@ static const KeyDownEntry keyDownEntries[] = {
     { VKEY_LEFT,   CommandKey,         "MoveToBeginningOfLine"                },
     { VKEY_LEFT,   CommandKey | ShiftKey,
       "MoveToBeginningOfLineAndModifySelection"                               },
+    { VKEY_PRIOR,  OptionKey,          "MovePageUp"                           },
+    { VKEY_NEXT,   OptionKey,          "MovePageDown"                         },
 #endif
 #if OS(DARWIN)
     { VKEY_UP,     CommandKey,         "MoveToBeginningOfDocument"            },

-- 
WebKit Debian packaging