wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1007320 - Release canceled fd callbacks earlier, r=jduell.

Browse Source
This commit is contained in:
Ben Turner 2014-05-07 16:09:37 -07:00
parent e910d21c56
commit 11399ea140
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/ipc/TabChild.cpp
View File

@ -1339,9 +1339,10 @@ TabChild::DestroyWindow()
mCachedFileDescriptorInfos[index];
MOZ_ASSERT(!info->mCallback);
MOZ_ASSERT(!info->mCanceled);
if (info->mFileDescriptor.IsValid()) {
MOZ_ASSERT(!info->mCanceled);
nsRefPtr<CloseFileRunnable> runnable =
new CloseFileRunnable(info->mFileDescriptor);
runnable->Dispatch();
@ -1579,6 +1580,9 @@ TabChild::CancelCachedFileDescriptorCallback(
MOZ_ASSERT(info->mCallback == aCallback);
MOZ_ASSERT(!info->mCanceled);
// No need to hold the callback any longer.
info->mCallback = nullptr;
// Set this flag so that we will close the file descriptor when it arrives.
info->mCanceled = true;
}