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

Fix merge problems

Browse Source
This commit is contained in:
Chris Jones 2010-02-23 00:08:29 -06:00
parent bc05dd163b
commit c4db394310
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsWindowRoot.cpp
View File

@ -81,7 +81,7 @@ nsWindowRoot::~nsWindowRoot()
}
}
NS_IMPL_CYCLE_COLLECTION_3(nsWindowRoot, mListenerManager, mFocusController,
NS_IMPL_CYCLE_COLLECTION_3(nsWindowRoot, mListenerManager, mPopupNode,
mParent)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot)

13
ipc/glue/AsyncChannel.cpp
View File

@ -202,19 +202,6 @@ AsyncChannel::SynchronouslyClose()
mCvar.Wait();
}
void
AsyncChannel::SynchronouslyClose()
{
AssertWorkerThread();
mMutex.AssertCurrentThreadOwns();
mIOLoop->PostTask(
FROM_HERE, NewRunnableMethod(this, &AsyncChannel::OnCloseChannel));
while (ChannelClosed != mChannelState)
mCvar.Wait();
}
bool
AsyncChannel::Send(Message* msg)
{