Fix cmd-up/cmd-down.

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "CSSStyleSelector.h"
@@ skipping 844 matching lines @@
       break;
     }
 
     default:
       break;
   }
   return false;
 }
 
 bool WebViewImpl::ScrollViewWithKeyboard(int key_code, int modifiers) {
-  Frame* frame = GetFocusedWebCoreFrame();
-  if (!frame)
-    return false;
-
   ScrollDirection scroll_direction;
   ScrollGranularity scroll_granularity;
 
   switch (key_code) {
     case VKEY_LEFT:
       scroll_direction = ScrollLeft;
       scroll_granularity = ScrollByLine;
       break;
     case VKEY_RIGHT:
       scroll_direction = ScrollRight;
       scroll_granularity = ScrollByLine;
       break;
     case VKEY_UP:
       scroll_direction = ScrollUp;
-#if defined(OS_MACOSX)
-      // Many Mac applications (such as TextEdit, Safari, Firefox, etc.) scroll
-      // to the beginning of a page when typing command+up keys. It is better
-      // for Mac Chrome to emulate this behavior to improve compatibility with
-      // these applications.
-      scroll_granularity = (modifiers == WebInputEvent::MetaKey) ?
-          ScrollByDocument : ScrollByLine;
-#else
       scroll_granularity = ScrollByLine;
-#endif
       break;
     case VKEY_DOWN:
       scroll_direction = ScrollDown;
-#if defined(OS_MACOSX)
-      // Many Mac applications (such as TextEdit, Safari, Firefox, etc.) scroll
-      // to the end of a page when typing command+down keys. It is better
-      // for Mac Chrome to emulate this behavior to improve compatibility with
-      // these applications.
-      scroll_granularity = (modifiers == WebInputEvent::MetaKey) ?
-          ScrollByDocument : ScrollByLine;
-#else
       scroll_granularity = ScrollByLine;
-#endif
       break;
     case VKEY_HOME:
       scroll_direction = ScrollUp;
       scroll_granularity = ScrollByDocument;
       break;
     case VKEY_END:
       scroll_direction = ScrollDown;
       scroll_granularity = ScrollByDocument;
       break;
     case VKEY_PRIOR:  // page up
       scroll_direction = ScrollUp;
       scroll_granularity = ScrollByPage;
       break;
     case VKEY_NEXT:  // page down
       scroll_direction = ScrollDown;
       scroll_granularity = ScrollByPage;
       break;
     default:
       return false;
   }
 
+  return PropagateScroll(scroll_direction, scroll_granularity);
+}
+
+bool WebViewImpl::PropagateScroll(
+    WebCore::ScrollDirection scroll_direction,
+    WebCore::ScrollGranularity scroll_granularity) {
+
+  Frame* frame = GetFocusedWebCoreFrame();
+  if (!frame)
+    return false;
+
   bool scroll_handled =
       frame->eventHandler()->scrollOverflow(scroll_direction,
                                             scroll_granularity);
   Frame* current_frame = frame;
   while (!scroll_handled && current_frame) {
     scroll_handled = current_frame->view()->scroll(scroll_direction,
                                                    scroll_granularity);
     current_frame = current_frame->tree()->parent();
   }
   return scroll_handled;
@@ skipping 998 matching lines @@
   return spelling_panel_is_visible_;
 }
 
 void WebViewImpl::SetTabsToLinks(bool enable) {
   tabs_to_links_ = enable;
 }
 
 bool WebViewImpl::GetTabsToLinks() const {
   return tabs_to_links_;
 }