mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +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
83 lines
2.3 KiB
C++
83 lines
2.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* 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 "nsXULTemplateResultSetRDF.h"
|
|
#include "nsXULTemplateQueryProcessorRDF.h"
|
|
|
|
NS_IMPL_ISUPPORTS(nsXULTemplateResultSetRDF, nsISimpleEnumerator)
|
|
|
|
NS_IMETHODIMP
|
|
nsXULTemplateResultSetRDF::HasMoreElements(bool *aResult)
|
|
{
|
|
*aResult = true;
|
|
|
|
nsCOMPtr<nsIRDFNode> node;
|
|
|
|
if (! mInstantiations || ! mQuery) {
|
|
*aResult = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
if (mCheckedNext) {
|
|
if (!mCurrent || mCurrent == &(mInstantiations->mHead))
|
|
*aResult = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
mCheckedNext = true;
|
|
|
|
do {
|
|
if (mCurrent) {
|
|
mCurrent = mCurrent->mNext;
|
|
if (mCurrent == &(mInstantiations->mHead)) {
|
|
*aResult = false;
|
|
return NS_OK;
|
|
}
|
|
}
|
|
else {
|
|
*aResult = ! mInstantiations->Empty();
|
|
if (*aResult)
|
|
mCurrent = mInstantiations->mHead.mNext;
|
|
}
|
|
|
|
// get the value of the member variable. If it is not set, skip
|
|
// the result and move on to the next result
|
|
if (mCurrent) {
|
|
mCurrent->mInstantiation.mAssignments.
|
|
GetAssignmentFor(mQuery->mMemberVariable, getter_AddRefs(node));
|
|
}
|
|
|
|
// only resources may be used as results
|
|
mResource = do_QueryInterface(node);
|
|
} while (! mResource);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsXULTemplateResultSetRDF::GetNext(nsISupports **aResult)
|
|
{
|
|
if (!aResult)
|
|
return NS_ERROR_NULL_POINTER;
|
|
|
|
if (!mCurrent || !mCheckedNext)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
RefPtr<nsXULTemplateResultRDF> nextresult =
|
|
new nsXULTemplateResultRDF(mQuery, mCurrent->mInstantiation, mResource);
|
|
if (!nextresult)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
// add the supporting memory elements to the processor's map. These are
|
|
// used to remove the results when an assertion is removed from the graph
|
|
mProcessor->AddMemoryElements(mCurrent->mInstantiation, nextresult);
|
|
|
|
mCheckedNext = false;
|
|
|
|
nextresult.forget(aResult);
|
|
|
|
return NS_OK;
|
|
}
|