Bug 1217565 - Fix assertion in nsWindow::IPCWindowProcHandler to account for suppressed neutering; r=jimm
authorAaron Klotz <aklotz@mozilla.com>
Thu, 22 Oct 2015 16:09:55 -0400
changeset 304370 d26c5883da8e9ccf62722cf34f455bbf3a5be8f8
parent 304369 2353ad287e4dfe7018d54c5e223eee73d59663d0
child 304371 4c8bffd9c6833412072e3f72afc6debab230b5cc
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1217565
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1217565 - Fix assertion in nsWindow::IPCWindowProcHandler to account for suppressed neutering; r=jimm
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -4389,17 +4389,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);
     }