mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
e4e2da55c9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
86 lines
1.9 KiB
C++
86 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsCache.h"
|
|
#include "nsCacheUtils.h"
|
|
#include "nsThreadUtils.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
class nsDestroyThreadEvent : public nsRunnable {
|
|
public:
|
|
explicit nsDestroyThreadEvent(nsIThread *thread)
|
|
: mThread(thread)
|
|
{}
|
|
NS_IMETHOD Run()
|
|
{
|
|
mThread->Shutdown();
|
|
return NS_OK;
|
|
}
|
|
private:
|
|
nsCOMPtr<nsIThread> mThread;
|
|
};
|
|
|
|
nsShutdownThread::nsShutdownThread(nsIThread *aThread)
|
|
: mLock("nsShutdownThread.mLock")
|
|
, mCondVar(mLock, "nsShutdownThread.mCondVar")
|
|
, mThread(aThread)
|
|
{
|
|
}
|
|
|
|
nsShutdownThread::~nsShutdownThread()
|
|
{
|
|
}
|
|
|
|
nsresult
|
|
nsShutdownThread::Shutdown(nsIThread *aThread)
|
|
{
|
|
nsresult rv;
|
|
RefPtr<nsDestroyThreadEvent> ev = new nsDestroyThreadEvent(aThread);
|
|
rv = NS_DispatchToMainThread(ev);
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING("Dispatching event in nsShutdownThread::Shutdown failed!");
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsShutdownThread::BlockingShutdown(nsIThread *aThread)
|
|
{
|
|
nsresult rv;
|
|
|
|
RefPtr<nsShutdownThread> st = new nsShutdownThread(aThread);
|
|
nsCOMPtr<nsIThread> workerThread;
|
|
|
|
rv = NS_NewNamedThread("thread shutdown", getter_AddRefs(workerThread));
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING("Can't create nsShutDownThread worker thread!");
|
|
return rv;
|
|
}
|
|
|
|
{
|
|
MutexAutoLock lock(st->mLock);
|
|
rv = workerThread->Dispatch(st, NS_DISPATCH_NORMAL);
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING(
|
|
"Dispatching event in nsShutdownThread::BlockingShutdown failed!");
|
|
} else {
|
|
st->mCondVar.Wait();
|
|
}
|
|
}
|
|
|
|
return Shutdown(workerThread);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsShutdownThread::Run()
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
mThread->Shutdown();
|
|
mCondVar.Notify();
|
|
return NS_OK;
|
|
}
|