mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 20:02:24 +01:00
c6111d5947
- Improve ordering of CefLoadHandler callbacks. OnLoadingStateChange will be called before and after all calls to OnLoadStart and OnLoadEnd. OnLoadStart/OnLoadEnd calls will occur as matching pairs (see http://crbug.com/539952#c2). - Remove the |requesting_url| argument to CefGeolocationHandler:: OnCancelGeolocationPermission. Clients can use the |request_id| argument to track this information themselves. - Fix a crash when loading the PDF extension in multiple browsers with a custom CefRequestContext (issue #1757).
20 lines
824 B
Diff
20 lines
824 B
Diff
diff --git hwnd_message_handler.cc hwnd_message_handler.cc
|
|
index 035df76..d1517b4 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,
|