mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
8aac23386e
- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest object passed to OnBeforeBrowse will no longer have an associated request identifier. - Mac: Remove additional helper apps which are no longer required (see http://crbug.com/520680) - Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see http://crbug.com/517114) - Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and NPAPI plugins are no longer supported (see http://crbug.com/470301#c11) - Add CefFormatUrlForSecurityDisplay function in cef_parser.h - Fix crash when passing `--disable-extensions` command-line flag (issue #1721) - Linux: Fix NSS handler loading (issue #1727)
20 lines
824 B
Diff
20 lines
824 B
Diff
diff --git hwnd_message_handler.cc hwnd_message_handler.cc
|
|
index 5348080..4f9bec5 100644
|
|
--- hwnd_message_handler.cc
|
|
+++ hwnd_message_handler.cc
|
|
@@ -2364,8 +2364,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
|
|
active_mouse_tracking_flags_ = 0;
|
|
} else if (event.type() == ui::ET_MOUSEWHEEL) {
|
|
// 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;
|
|
}
|
|
|
|
// There are cases where the code handling the message destroys the window,
|