Handle Ctrl+Mousewheel after renderer

content/browser/renderer_host/input/input_router_impl.cc

 // Copyright 2013 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 "content/browser/renderer_host/input/input_router_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 406 matching lines @@
     ProcessInputEventAck(input_event.type,
                          INPUT_EVENT_ACK_STATE_IGNORED,
                          latency_info,
                          IGNORING_DISPOSITION);
   }
 }
 
 bool InputRouterImpl::OfferToOverscrollController(
     const WebInputEvent& input_event,
     const ui::LatencyInfo& latency_info) {
+#if !defined(OS_MACOSX)
+  // Ctrl + mousewheel is reserved for zooming on every platform except for Mac.
+  if (input_event.type == WebInputEvent::MouseWheel &&
+      input_event.modifiers & WebInputEvent::ControlKey)
+    return false;
+#endif
+
   OverscrollController* controller = client_->GetOverscrollController();
   if (!controller)
     return false;
 
   OverscrollController::Disposition disposition =
       controller->DispatchEvent(input_event, latency_info);
 
   bool consumed = disposition == OverscrollController::CONSUMED;
 
   if (disposition == OverscrollController::SHOULD_FORWARD_TO_GESTURE_QUEUE) {
@@ skipping 186 matching lines @@
   if (next_mouse_move_) {
     DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove);
     scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move
         = next_mouse_move_.Pass();
     SendMouseEvent(*next_mouse_move);
   }
 }
 
 void InputRouterImpl::ProcessWheelAck(InputEventAckState ack_result,
                                       const ui::LatencyInfo& latency) {
+#if defined(OS_MACOSX)
   ProcessAckForOverscroll(current_wheel_event_.event, ack_result);
+#else
+  // Ctrl + mousewheel is reserved for zooming on every platform except for Mac.
+  if (!(current_wheel_event_.event.modifiers & WebInputEvent::ControlKey)) {
+    ProcessAckForOverscroll(current_wheel_event_.event, ack_result);
+  }
+#endif
 
   // TODO(miletus): Add renderer side latency to each uncoalesced mouse
   // wheel event and add terminal component to each of them.
   current_wheel_event_.latency.AddNewLatencyFrom(latency);
   // Process the unhandled wheel event here before calling SendWheelEvent()
   // since it will mutate current_wheel_event_.
   ack_handler_->OnWheelEventAck(current_wheel_event_, ack_result);
   mouse_wheel_pending_ = false;
 
   // Now send the next (coalesced) mouse wheel event.
@@ skipping 120 matching lines @@
       break;
   }
 }
 
 bool InputRouterImpl::IsInOverscrollGesture() const {
   OverscrollController* controller = client_->GetOverscrollController();
   return controller && controller->overscroll_mode() != OVERSCROLL_NONE;
 }
 
 }  // namespace content