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
78 lines
2.2 KiB
C++
78 lines
2.2 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/. */
|
|
|
|
#ifndef nsFind_h__
|
|
#define nsFind_h__
|
|
|
|
#include "nsIFind.h"
|
|
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsCycleCollectionParticipant.h"
|
|
#include "nsIDOMNode.h"
|
|
#include "nsIDOMRange.h"
|
|
#include "nsIContentIterator.h"
|
|
#include "nsIWordBreaker.h"
|
|
|
|
class nsIContent;
|
|
|
|
#define NS_FIND_CONTRACTID "@mozilla.org/embedcomp/rangefind;1"
|
|
|
|
#define NS_FIND_CID \
|
|
{0x471f4944, 0x1dd2, 0x11b2, {0x87, 0xac, 0x90, 0xbe, 0x0a, 0x51, 0xd6, 0x09}}
|
|
|
|
class nsFindContentIterator;
|
|
|
|
class nsFind : public nsIFind
|
|
{
|
|
public:
|
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
|
NS_DECL_NSIFIND
|
|
NS_DECL_CYCLE_COLLECTION_CLASS(nsFind)
|
|
|
|
nsFind();
|
|
|
|
static already_AddRefed<nsIDOMRange> CreateRange(nsINode* aNode);
|
|
|
|
protected:
|
|
virtual ~nsFind();
|
|
|
|
// Parameters set from the interface:
|
|
//nsCOMPtr<nsIDOMRange> mRange; // search only in this range
|
|
bool mFindBackward;
|
|
bool mCaseSensitive;
|
|
|
|
nsCOMPtr<nsIWordBreaker> mWordBreaker;
|
|
|
|
int32_t mIterOffset;
|
|
nsCOMPtr<nsIDOMNode> mIterNode;
|
|
|
|
// Last block parent, so that we will notice crossing block boundaries:
|
|
nsCOMPtr<nsIDOMNode> mLastBlockParent;
|
|
nsresult GetBlockParent(nsIDOMNode* aNode, nsIDOMNode** aParent);
|
|
|
|
// Utility routines:
|
|
bool IsTextNode(nsIDOMNode* aNode);
|
|
bool IsBlockNode(nsIContent* aNode);
|
|
bool SkipNode(nsIContent* aNode);
|
|
bool IsVisibleNode(nsIDOMNode* aNode);
|
|
|
|
// Move in the right direction for our search:
|
|
nsresult NextNode(nsIDOMRange* aSearchRange,
|
|
nsIDOMRange* aStartPoint, nsIDOMRange* aEndPoint,
|
|
bool aContinueOk);
|
|
|
|
// Reset variables before returning -- don't hold any references.
|
|
void ResetAll();
|
|
|
|
// The iterator we use to move through the document:
|
|
nsresult InitIterator(nsIDOMNode* aStartNode, int32_t aStartOffset,
|
|
nsIDOMNode* aEndNode, int32_t aEndOffset);
|
|
RefPtr<nsFindContentIterator> mIterator;
|
|
};
|
|
|
|
#endif // nsFind_h__
|