2015-07-31 14:45:31 -04:00
|
|
|
diff --git hwnd_message_handler.cc hwnd_message_handler.cc
|
2015-08-25 18:33:31 -04:00
|
|
|
index b394556..729cacf 100644
|
2015-07-31 14:45:31 -04:00
|
|
|
--- hwnd_message_handler.cc
|
|
|
|
|
+++ hwnd_message_handler.cc
|
2015-08-25 18:33:31 -04:00
|
|
|
@@ -2687,8 +2687,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
|
2015-07-31 14:45:31 -04:00
|
|
|
"440919 HWNDMessageHandler::HandleMouseEventInternal6"));
|
|
|
|
|
|
|
|
|
|
// Reroute the mouse wheel to the window under the pointer if applicable.
|
|
|
|
|
- return (ui::RerouteMouseWheel(hwnd(), w_param, l_param) ||
|
|
|
|
|
- delegate_->HandleMouseEvent(ui::MouseWheelEvent(msg))) ? 0 : 1;
|
|
|
|
|
+ if (ui::RerouteMouseWheel(hwnd(), w_param, l_param) ||
|
|
|
|
|
+ delegate_->HandleMouseEvent(ui::MouseWheelEvent(msg))) {
|
|
|
|
|
+ SetMsgHandled(TRUE);
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ }
|
|
|
|
|
+ return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
|
