mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 08:35:26 +00:00
01583602a9
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
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
144 lines
3.4 KiB
C++
144 lines
3.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "nsObserverList.h"
|
|
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCOMArray.h"
|
|
#include "nsISimpleEnumerator.h"
|
|
#include "xpcpublic.h"
|
|
|
|
nsresult
|
|
nsObserverList::AddObserver(nsIObserver* anObserver, bool ownsWeak)
|
|
{
|
|
NS_ASSERTION(anObserver, "Null input");
|
|
|
|
if (!ownsWeak) {
|
|
ObserverRef* o = mObservers.AppendElement(anObserver);
|
|
if (!o) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsIWeakReference> weak = do_GetWeakReference(anObserver);
|
|
if (!weak) {
|
|
return NS_NOINTERFACE;
|
|
}
|
|
|
|
ObserverRef* o = mObservers.AppendElement(weak);
|
|
if (!o) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsObserverList::RemoveObserver(nsIObserver* anObserver)
|
|
{
|
|
NS_ASSERTION(anObserver, "Null input");
|
|
|
|
if (mObservers.RemoveElement(static_cast<nsISupports*>(anObserver))) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsIWeakReference> observerRef = do_GetWeakReference(anObserver);
|
|
if (!observerRef) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
if (!mObservers.RemoveElement(observerRef)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsObserverList::GetObserverList(nsISimpleEnumerator** anEnumerator)
|
|
{
|
|
RefPtr<nsObserverEnumerator> e(new nsObserverEnumerator(this));
|
|
e.forget(anEnumerator);
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsObserverList::FillObserverArray(nsCOMArray<nsIObserver>& aArray)
|
|
{
|
|
aArray.SetCapacity(mObservers.Length());
|
|
|
|
nsTArray<ObserverRef> observers(mObservers);
|
|
|
|
for (int32_t i = observers.Length() - 1; i >= 0; --i) {
|
|
if (observers[i].isWeakRef) {
|
|
nsCOMPtr<nsIObserver> o(do_QueryReferent(observers[i].asWeak()));
|
|
if (o) {
|
|
aArray.AppendObject(o);
|
|
} else {
|
|
// the object has gone away, remove the weakref
|
|
mObservers.RemoveElement(observers[i].asWeak());
|
|
}
|
|
} else {
|
|
aArray.AppendObject(observers[i].asObserver());
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
nsObserverList::AppendStrongObservers(nsCOMArray<nsIObserver>& aArray)
|
|
{
|
|
aArray.SetCapacity(aArray.Length() + mObservers.Length());
|
|
|
|
for (int32_t i = mObservers.Length() - 1; i >= 0; --i) {
|
|
if (!mObservers[i].isWeakRef) {
|
|
aArray.AppendObject(mObservers[i].asObserver());
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
nsObserverList::NotifyObservers(nsISupports* aSubject,
|
|
const char* aTopic,
|
|
const char16_t* someData)
|
|
{
|
|
nsCOMArray<nsIObserver> observers;
|
|
FillObserverArray(observers);
|
|
|
|
for (int32_t i = 0; i < observers.Count(); ++i) {
|
|
observers[i]->Observe(aSubject, aTopic, someData);
|
|
}
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsObserverEnumerator, nsISimpleEnumerator)
|
|
|
|
nsObserverEnumerator::nsObserverEnumerator(nsObserverList* aObserverList)
|
|
: mIndex(0)
|
|
{
|
|
aObserverList->FillObserverArray(mObservers);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsObserverEnumerator::HasMoreElements(bool* aResult)
|
|
{
|
|
*aResult = (mIndex < mObservers.Count());
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsObserverEnumerator::GetNext(nsISupports** aResult)
|
|
{
|
|
if (mIndex == mObservers.Count()) {
|
|
NS_ERROR("Enumerating after HasMoreElements returned false.");
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
|
|
NS_ADDREF(*aResult = mObservers[mIndex]);
|
|
++mIndex;
|
|
return NS_OK;
|
|
}
|