Bug 1072752: Make Chromium UI message loops for Windows call into WinUtils::WaitForMessage; r=jimm

ipc/chromium/src/base/message_pump_win.cc

@@ -9,6 +9,7 @@
 #include "base/message_loop.h"
 #include "base/histogram.h"
 #include "base/win_util.h"
+#include "WinUtils.h"
 
 using base::Time;
 
@@ -263,31 +264,7 @@ void MessagePumpForUI::WaitForWork() {
   if (delay < 0)  // Negative value means no timers waiting.
     delay = INFINITE;
 
-  DWORD result;
-  result = MsgWaitForMultipleObjectsEx(0, NULL, delay, QS_ALLINPUT,
-                                       MWMO_INPUTAVAILABLE);
-
-  if (WAIT_OBJECT_0 == result) {
-    // A WM_* message is available.
-    // If a parent child relationship exists between windows across threads
-    // then their thread inputs are implicitly attached.
-    // This causes the MsgWaitForMultipleObjectsEx API to return indicating
-    // that messages are ready for processing (specifically mouse messages
-    // intended for the child window. Occurs if the child window has capture)
-    // The subsequent PeekMessages call fails to return any messages thus
-    // causing us to enter a tight loop at times.
-    // The WaitMessage call below is a workaround to give the child window
-    // sometime to process its input messages.
-    MSG msg = {0};
-    DWORD queue_status = GetQueueStatus(QS_MOUSE);
-    if (HIWORD(queue_status) & QS_MOUSE &&
-       !PeekMessage(&msg, NULL, WM_MOUSEFIRST, WM_MOUSELAST, PM_NOREMOVE)) {
-      WaitMessage();
-    }
-    return;
-  }
-
-  DCHECK_NE(WAIT_FAILED, result) << GetLastError();
+  mozilla::widget::WinUtils::WaitForMessage(delay);
 }
 
 void MessagePumpForUI::HandleWorkMessage() {

widget/windows/WinUtils.cpp

@@ -622,13 +622,24 @@ WinUtils::GetMessage(LPMSG aMsg, HWND aWnd, UINT aFirstMessage,
 
 /* static */
 void
-WinUtils::WaitForMessage()
+WinUtils::WaitForMessage(DWORD aTimeoutMs)
 {
+  const DWORD waitStart = ::GetTickCount();
+  DWORD elapsed = 0;
   while (true) {
-    DWORD result = ::MsgWaitForMultipleObjectsEx(0, NULL, INFINITE,
+    if (aTimeoutMs != INFINITE) {
+      elapsed = ::GetTickCount() - waitStart;
+    }
+    if (elapsed >= aTimeoutMs) {
+      break;
+    }
+    DWORD result = ::MsgWaitForMultipleObjectsEx(0, NULL, aTimeoutMs - elapsed,
                                                  MOZ_QS_ALLEVENT,
                                                  MWMO_INPUTAVAILABLE);
     NS_WARN_IF_FALSE(result != WAIT_FAILED, "Wait failed");
+    if (result == WAIT_TIMEOUT) {
+      break;
+    }
 
     // Sent messages (via SendMessage and friends) are processed differently
     // than queued messages (via PostMessage); the destination window procedure

widget/windows/WinUtils.h

@@ -153,8 +153,9 @@ public:
    * not aware of (e.g., from a different thread).
    * Note that this method may cause sync dispatch of sent (as opposed to
    * posted) messages.
+   * @param aTimeoutMs Timeout for waiting in ms, defaults to INFINITE
    */
-  static void WaitForMessage();
+  static void WaitForMessage(DWORD aTimeoutMs = INFINITE);
 
   /**
    * Gets the value of a string-typed registry value.