mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-02 07:05:24 +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
88 lines
2.7 KiB
C++
88 lines
2.7 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 NS_SMILTARGETIDENTIFIER_H_
|
|
#define NS_SMILTARGETIDENTIFIER_H_
|
|
|
|
#include "mozilla/dom/Element.h"
|
|
#include "nsAutoPtr.h"
|
|
|
|
/**
|
|
* Struct: nsSMILTargetIdentifier
|
|
*
|
|
* Tuple of: { Animated Element, Attribute Name, Attribute Type (CSS vs. XML) }
|
|
*
|
|
* Used in nsSMILAnimationController as hash key for mapping an animation
|
|
* target to the nsSMILCompositor for that target.
|
|
*
|
|
* NOTE: Need a nsRefPtr for the element & attribute name, because
|
|
* nsSMILAnimationController retain its hash table for one sample into the
|
|
* future, and we need to make sure their target isn't deleted in that time.
|
|
*/
|
|
|
|
struct nsSMILTargetIdentifier
|
|
{
|
|
nsSMILTargetIdentifier()
|
|
: mElement(nullptr), mAttributeName(nullptr),
|
|
mAttributeNamespaceID(kNameSpaceID_Unknown), mIsCSS(false) {}
|
|
|
|
inline bool Equals(const nsSMILTargetIdentifier& aOther) const
|
|
{
|
|
return (aOther.mElement == mElement &&
|
|
aOther.mAttributeName == mAttributeName &&
|
|
aOther.mAttributeNamespaceID == mAttributeNamespaceID &&
|
|
aOther.mIsCSS == mIsCSS);
|
|
}
|
|
|
|
RefPtr<mozilla::dom::Element> mElement;
|
|
RefPtr<nsIAtom> mAttributeName;
|
|
int32_t mAttributeNamespaceID;
|
|
bool mIsCSS;
|
|
};
|
|
|
|
/**
|
|
* Class: nsSMILWeakTargetIdentifier
|
|
*
|
|
* Version of the above struct that uses non-owning pointers. These are kept
|
|
* private, to ensure that they aren't ever dereferenced (or used at all,
|
|
* outside of Equals()).
|
|
*
|
|
* This is solely for comparisons to determine if a target has changed
|
|
* from one sample to the next.
|
|
*/
|
|
class nsSMILWeakTargetIdentifier
|
|
{
|
|
public:
|
|
// Trivial constructor
|
|
nsSMILWeakTargetIdentifier()
|
|
: mElement(nullptr), mAttributeName(nullptr), mIsCSS(false) {}
|
|
|
|
// Allow us to update a weak identifier to match a given non-weak identifier
|
|
nsSMILWeakTargetIdentifier&
|
|
operator=(const nsSMILTargetIdentifier& aOther)
|
|
{
|
|
mElement = aOther.mElement;
|
|
mAttributeName = aOther.mAttributeName;
|
|
mIsCSS = aOther.mIsCSS;
|
|
return *this;
|
|
}
|
|
|
|
// Allow for comparison vs. non-weak identifier
|
|
inline bool Equals(const nsSMILTargetIdentifier& aOther) const
|
|
{
|
|
return (aOther.mElement == mElement &&
|
|
aOther.mAttributeName == mAttributeName &&
|
|
aOther.mIsCSS == mIsCSS);
|
|
}
|
|
|
|
private:
|
|
const nsIContent* mElement;
|
|
const nsIAtom* mAttributeName;
|
|
bool mIsCSS;
|
|
};
|
|
|
|
#endif // NS_SMILTARGETIDENTIFIER_H_
|