зеркало из https://github.com/mozilla/gecko-dev.git
Fix merge problems
This commit is contained in:
Родитель
66e2a2f448
Коммит
e19ad54797
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче