mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-04-15 11:17:27 +02:00
f7aa98fe69
- Building on Windows now requires the Windows 10.0.10586 SDK. - Remove CefParseCSSColor which was implemented using Blink code in the browser process. This is longer advisable now that the Oilpan GC is enabled. - Avoid potential renderer process crashes by disabling script actions on the CefV8Context passed to CefRenderProcessHandler::OnContextReleased.
20 lines
824 B
Diff
20 lines
824 B
Diff
diff --git hwnd_message_handler.cc hwnd_message_handler.cc
|
|
index f632827..b6c912c 100644
|
|
--- hwnd_message_handler.cc
|
|
+++ hwnd_message_handler.cc
|
|
@@ -2382,8 +2382,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,
|