summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-21 17:04:02 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-21 17:04:02 +0000
commit9284f2966beccfd017f3f85809375508412fe0e2 (patch)
treecfe8c2604677aa3857f2316ff574dc9bc4f7dbee /webkit
parent3c92e2472c00fb74f6bc01896235f1e98e6dfc19 (diff)
downloadchromium_src-9284f2966beccfd017f3f85809375508412fe0e2.zip
chromium_src-9284f2966beccfd017f3f85809375508412fe0e2.tar.gz
chromium_src-9284f2966beccfd017f3f85809375508412fe0e2.tar.bz2
Shift+PageUp and Shift+PageDown should not scroll the web page.
Alt and Ctrl already don't scroll. Win+PageUp/PageDown does scroll. This matches Firefox. It doesn't match IE; IE lets you scroll using ctrl, shift or win. I'm doing this so the standard GTK+ key binding for ctrl+shift+page{up/down} can be used on linux to move tabs left/right (otherwise, the page scrolls and eats the key before we get to it). BUG=21594 Review URL: http://codereview.chromium.org/214026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webview_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 278b115..89f7e2c 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -848,7 +848,7 @@ bool WebViewImpl::KeyEventDefault(const WebKeyboardEvent& event) {
return false;
}
}
- if (!event.isSystemKey) {
+ if (!event.isSystemKey && !(event.modifiers & WebInputEvent::ShiftKey)) {
return ScrollViewWithKeyboard(event.windowsKeyCode, event.modifiers);
}
break;