Bug 561117 - "hang-pair: hang|mozilla::plugins::PPluginInstanceParent::CallNPP_SetWindow(mozilla::plugins::NPRemoteWindow const &) against hang|NtUserMessageCall | SendMessageWorker" [r=benjamin] [a=LegNeato]
authorJim Mathies <jmathies@mozilla.com>
Thu, 22 Apr 2010 11:31:00 -0500
changeset 34111 2e12fc0d07f4e7618094297bcb60a195dc095fd1
parent 34110 ca6df0574ed6908d840791225848291ea910f63d
child 34115 696564543249abab02c0e495a68224a3afdc02f4
push id1278
push usercjones@mozilla.com
push dateFri, 23 Apr 2010 18:23:11 +0000
reviewersbenjamin, LegNeato
bugs561117
milestone1.9.2.5pre
Bug 561117 - "hang-pair: hang|mozilla::plugins::PPluginInstanceParent::CallNPP_SetWindow(mozilla::plugins::NPRemoteWindow const &) against hang|NtUserMessageCall | SendMessageWorker" [r=benjamin] [a=LegNeato]
widget/src/windows/nsWindow.cpp
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -3627,19 +3627,19 @@ nsWindow::IPCWindowProcHandler(UINT& msg
   switch(msg) {
     // Windowless flash sending WM_ACTIVATE events to the main window
     // via calls to ShowWindow.
     case WM_ACTIVATE:
       if (lParam != 0 && LOWORD(wParam) == WA_ACTIVE &&
           IsWindow((HWND)lParam))
         handled = PR_TRUE;
     break;
-
+    // Wheel events forwarded from the child.
+    case WM_MOUSEWHEEL:
     // Plugins taking or losing focus triggering focus app messages.
-    // dwResult = 0
     case WM_SETFOCUS:
     case WM_KILLFOCUS:
     // Windowed plugins that pass sys key events to defwndproc generate
     // WM_SYSCOMMAND events to the main window.
     case WM_SYSCOMMAND:
     // Windowed plugins that fire context menu selection events to parent
     // windows.
     case WM_CONTEXTMENU: