corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1189709 - Reduce scope of MessageChannel window neutering. r=jimm

Browse Source 
CLOSED TREE
This commit is contained in:
Aaron Klotz
2015-08-26 15:57:29 -06:00
parent 92b20d51ec
commit 32c8b8dbe2
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipc/glue/MessageChannel.cpp
View File

@@ -995,7 +995,6 @@ MessageChannel::Call(Message* aMsg, Message* aReply)
#ifdef OS_WIN #ifdef OS_WIN
SyncStackFrame frame(this, true); SyncStackFrame frame(this, true);
NeuteredWindowRegion neuteredRgn(mFlags & REQUIRE_DEFERRED_MESSAGE_PROTECTION);
#endif #endif
// This must come before MonitorAutoLock, as its destructor acquires the // This must come before MonitorAutoLock, as its destructor acquires the
@@ -1035,9 +1034,16 @@ MessageChannel::Call(Message* aMsg, Message* aReply)
} }
#ifdef OS_WIN #ifdef OS_WIN
// We need to limit the scoped of neuteredRgn to this spot in the code.
// Window neutering can't be enabled during some plugin calls because
// we then risk the neutered window procedure being subclassed by a
// plugin.
{
NeuteredWindowRegion neuteredRgn(mFlags & REQUIRE_DEFERRED_MESSAGE_PROTECTION);
/* We should pump messages at this point to ensure that the IPC peer /* We should pump messages at this point to ensure that the IPC peer
does not become deadlocked on a pending inter-thread SendMessage() */ does not become deadlocked on a pending inter-thread SendMessage() */
neuteredRgn.PumpOnce(); neuteredRgn.PumpOnce();
}
#endif #endif
// Now might be the time to process a message deferred because of race // Now might be the time to process a message deferred because of race

9
ipc/glue/WindowsMessageLoop.cpp
View File

@@ -894,10 +894,10 @@ StopNeutering()
} }
NeuteredWindowRegion::NeuteredWindowRegion(bool aDoNeuter MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL) NeuteredWindowRegion::NeuteredWindowRegion(bool aDoNeuter MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
: mNeuteredByThis(!gWindowHook) : mNeuteredByThis(!gWindowHook && aDoNeuter)
{ {
MOZ_GUARD_OBJECT_NOTIFIER_INIT; MOZ_GUARD_OBJECT_NOTIFIER_INIT;
if (aDoNeuter && mNeuteredByThis) { if (mNeuteredByThis) {
StartNeutering(); StartNeutering();
} }
} }
@@ -912,6 +912,11 @@ NeuteredWindowRegion::~NeuteredWindowRegion()
void void
NeuteredWindowRegion::PumpOnce() NeuteredWindowRegion::PumpOnce()
{ {
if (!gWindowHook) {
// This should be a no-op if nothing has been neutered.
return;
}
MSG msg = {0}; MSG msg = {0};
// Pump any COM messages so that we don't hang due to STA marshaling. // Pump any COM messages so that we don't hang due to STA marshaling.
if (gCOMWindow && ::PeekMessageW(&msg, gCOMWindow, 0, 0, PM_REMOVE)) { if (gCOMWindow && ::PeekMessageW(&msg, gCOMWindow, 0, 0, PM_REMOVE)) {