Bug 1217565 - Fix assertion in nsWindow::IPCWindowProcHandler to account for suppressed neutering; r=jimm, a=lizzard
authorAaron Klotz <aklotz@mozilla.com>
Thu, 22 Oct 2015 16:09:55 -0400
changeset 296566 f12d6489dda48fd709366e71dc7052fd1ed2fa66
parent 296565 21faa7b5534a36eee66c1074b6c3dcb9667457be
child 296567 ca8dde257742b3c86a8fe405debe792f421c9432
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm, lizzard
bugs1217565
milestone43.0a2
Bug 1217565 - Fix assertion in nsWindow::IPCWindowProcHandler to account for suppressed neutering; r=jimm, a=lizzard
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -4404,17 +4404,18 @@ nsWindow::IsAsyncResponseEvent(UINT aMsg
 
   return false;
 }
 
 void
 nsWindow::IPCWindowProcHandler(UINT& msg, WPARAM& wParam, LPARAM& lParam)
 {
   MOZ_ASSERT_IF(msg != WM_GETOBJECT,
-                !mozilla::ipc::MessageChannel::IsPumpingMessages());
+                !mozilla::ipc::MessageChannel::IsPumpingMessages() ||
+                mozilla::ipc::SuppressedNeuteringRegion::IsNeuteringSuppressed());
 
   // Modal UI being displayed in windowless plugins.
   if (mozilla::ipc::MessageChannel::IsSpinLoopActive() &&
       (InSendMessageEx(nullptr) & (ISMEX_REPLIED|ISMEX_SEND)) == ISMEX_SEND) {
     LRESULT res;
     if (IsAsyncResponseEvent(msg, res)) {
       ReplyMessage(res);
     }