| Index: content/renderer/input/input_handler_proxy.cc
|
| diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc
|
| index 789cb58f26f08cc2904bd29e5deb6f54e3a16c45..95809a857511b889237d2e7337be62ace6c0be43 100644
|
| --- a/content/renderer/input/input_handler_proxy.cc
|
| +++ b/content/renderer/input/input_handler_proxy.cc
|
| @@ -115,6 +115,11 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent(
|
| // thread, so punt it to the main thread. http://crbug.com/236639
|
| return DID_NOT_HANDLE;
|
| }
|
| + if (wheel_event.modifiers & WebInputEvent::ControlKey) {
|
| + // Wheel events involving the control key never trigger scrolling, only
|
| + // event handlers. Forward to the main thread.
|
| + return DID_NOT_HANDLE;
|
| + }
|
| cc::InputHandler::ScrollStatus scroll_status = input_handler_->ScrollBegin(
|
| gfx::Point(wheel_event.x, wheel_event.y), cc::InputHandler::Wheel);
|
| switch (scroll_status) {
|
|
|