Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1289001 - Fix a race condition in the use of TabChild::mIPCOpen, r=jld

Browse Source
This commit is contained in:
Andrea Marchesini 2016-11-11 20:23:28 +01:00
parent 26a93c3db2
commit a8fa7a66fa
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dom/ipc/TabChild.cpp
View File

@ -314,12 +314,7 @@ private:
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(mTabChild);
// Check in case ActorDestroy was called after RecvDestroy message.
if (mTabChild->IPCOpen()) {
Unused << PBrowserChild::Send__delete__(mTabChild);
}
mTabChild->SendDeleteIfOpen();
mTabChild = nullptr;
return NS_OK;
}
@ -1177,6 +1172,20 @@ TabChild::DestroyWindow()
}
}
void
TabChild::SendDeleteIfOpen()
{
// Check in case ActorDestroy was called after RecvDestroy message.
if (mIPCOpen) {
// We must consider the IPC actor already dismissed in order to return the
// corrent value in IPCOpen().
mIPCOpen = false;
Unused << PBrowserChild::Send__delete__(this);
}
}
void
TabChild::ActorDestroy(ActorDestroyReason why)
{

2
dom/ipc/TabChild.h
View File

@ -749,6 +749,8 @@ private:
mUnscaledInnerSize = aSize;
}
void SendDeleteIfOpen();
class DelayedDeleteRunnable;
TextureFactoryIdentifier mTextureFactoryIdentifier;