Fix mouse wheel events in pointer lock on aura.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 2313 matching lines @@
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnMouseEvent");
 
   if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event))
     return;
 
   if (mouse_locked_) {
     aura::client::CursorClient* cursor_client =
         aura::client::GetCursorClient(window_->GetRootWindow());
     DCHECK(!cursor_client || !cursor_client->IsCursorVisible());
 
+    if (event->type() == ui::ET_MOUSEWHEEL) {

[ananta, 2013/06/05 23:16:14]

We should be handling this similarly for mouse wheel events received when the
mouse is not locked?

[scheib, 2013/06/06 02:42:37]

True. That code already exists below, outside of the if(mouse_locked_) block. It
is more complicated as it deals with not having focus on Windows. While in mouse
like we will always have focus (loss of focus drops mouse lock).

+      WebKit::WebMouseWheelEvent mouse_wheel_event =
+          MakeWebMouseWheelEvent(static_cast<ui::MouseWheelEvent*>(event));
+      if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0)
+        host_->ForwardWheelEvent(mouse_wheel_event);
+      return;
+    }
+
     WebKit::WebMouseEvent mouse_event = MakeWebMouseEvent(event);
     gfx::Point center(gfx::Rect(window_->bounds().size()).CenterPoint());
 
     bool is_move_to_center_event = (event->type() == ui::ET_MOUSE_MOVED ||
         event->type() == ui::ET_MOUSE_DRAGGED) &&
         mouse_event.x == center.x() && mouse_event.y == center.y();
 
     ModifyEventMovementAndCoords(&mouse_event);
 
     bool should_not_forward = is_move_to_center_event && synthetic_move_sent_;
@@ skipping 22 matching lines @@
   if (host_->overscroll_controller() &&
       host_->overscroll_controller()->overscroll_mode() != OVERSCROLL_NONE &&
       event->flags() & ui::EF_IS_SYNTHESIZED &&
       (event->type() == ui::ET_MOUSE_ENTERED ||
        event->type() == ui::ET_MOUSE_EXITED ||
        event->type() == ui::ET_MOUSE_MOVED)) {
     event->StopPropagation();
     return;
   }
 
   if (event->type() == ui::ET_MOUSEWHEEL) {

[scheib, 2013/06/06 02:42:37]

Here.

 #if defined(OS_WIN)
     // We get mouse wheel/scroll messages even if we are not in the foreground.
     // So here we check if we have any owned popup windows in the foreground and
     // dismiss them.
     aura::RootWindow* root_window = window_->GetRootWindow();
     if (root_window) {
       HWND parent = root_window->GetAcceleratedWidget();
       HWND toplevel_hwnd = ::GetAncestor(parent, GA_ROOT);
       EnumThreadWindows(GetCurrentThreadId(),
                         DismissOwnedPopups,
@@ skipping 604 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content