summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/render_widget_host_delegate.cc
diff options
context:
space:
mode:
authorrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-03 21:04:13 +0000
committerrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-03 21:04:13 +0000
commitd92026effd730a604fcd98a43135257fcf40d53d (patch)
treead8862b1438a14bb270581063282063abbbeb594 /content/browser/renderer_host/render_widget_host_delegate.cc
parent5f6fe596dd617e14bacddacd814fa1bf2ce421f7 (diff)
downloadchromium_src-d92026effd730a604fcd98a43135257fcf40d53d.zip
chromium_src-d92026effd730a604fcd98a43135257fcf40d53d.tar.gz
chromium_src-d92026effd730a604fcd98a43135257fcf40d53d.tar.bz2
Give blink a chance to consume ctrl+wheel events before zooming
Today chromium consumes all mouse wheel events when the control key is pressed for the purposes of browser zoom (except on MacOS). With this change we give the web page a chance to get and consume the wheel event first, in case it wants to override the behavior. This makes Chrome consistent with IE and Firefox on Windows. See http://crbug.com/289887 and the linked chromium-dev thread for discussion. Apparently there were no tests at all for this functionality. I've added new unit tests at RenderWidgetHost and WebContents layers. Depends on blink change http://src.chromium.org/viewvc/blink?view=rev&rev=168088 BUG=289887 Review URL: https://codereview.chromium.org/177213016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_delegate.cc')
-rw-r--r--content/browser/renderer_host/render_widget_host_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_widget_host_delegate.cc b/content/browser/renderer_host/render_widget_host_delegate.cc
index 09f4967..a3b66e2 100644
--- a/content/browser/renderer_host/render_widget_host_delegate.cc
+++ b/content/browser/renderer_host/render_widget_host_delegate.cc
@@ -12,7 +12,7 @@ bool RenderWidgetHostDelegate::PreHandleKeyboardEvent(
return false;
}
-bool RenderWidgetHostDelegate::PreHandleWheelEvent(
+bool RenderWidgetHostDelegate::HandleWheelEvent(
const blink::WebMouseWheelEvent& event) {
return false;
}