mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 15:55:36 +00:00
dfd3b7e7aa
This patch merges nsAtom into nsIAtom. For the moment, both names can be used
interchangeably due to a typedef. The patch also devirtualizes nsIAtom, by
making it not inherit from nsISupports, removing NS_DECL_NSIATOM, and dropping
the use of NS_IMETHOD_. It also removes nsIAtom's IIDs.
These changes trigger knock-on changes throughout the codebase, changing the
types of lots of things as follows.
- nsCOMPtr<nsIAtom> --> RefPtr<nsIAtom>
- nsCOMArray<nsIAtom> --> nsTArray<RefPtr<nsIAtom>>
- Count() --> Length()
- ObjectAt() --> ElementAt()
- AppendObject() --> AppendElement()
- RemoveObjectAt() --> RemoveElementAt()
- ns*Hashtable<nsISupportsHashKey, ...> -->
ns*Hashtable<nsRefPtrHashKey<nsIAtom>, ...>
- nsInterfaceHashtable<T, nsIAtom> --> nsRefPtrHashtable<T, nsIAtom>
- This requires adding a Get() method to nsRefPtrHashtable that it lacks but
nsInterfaceHashtable has.
- nsCOMPtr<nsIMutableArray> --> nsTArray<RefPtr<nsIAtom>>
- nsArrayBase::Create() --> nsTArray()
- GetLength() --> Length()
- do_QueryElementAt() --> operator[]
The patch also has some changes to Rust code that manipulates nsIAtom.
MozReview-Commit-ID: DykOl8aEnUJ
--HG--
extra : rebase_source : 254404e318e94b4c93ec8d4081ff0f0fda8aa7d1
71 lines
1.7 KiB
C++
71 lines
1.7 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/. */
|
|
|
|
#ifndef TRANSFRMX_EXPANDEDNAME_H
|
|
#define TRANSFRMX_EXPANDEDNAME_H
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIAtom.h"
|
|
#include "mozilla/dom/NameSpaceConstants.h"
|
|
|
|
class txNamespaceMap;
|
|
|
|
class txExpandedName {
|
|
public:
|
|
txExpandedName() : mNamespaceID(kNameSpaceID_None)
|
|
{
|
|
}
|
|
|
|
txExpandedName(int32_t aNsID,
|
|
nsIAtom* aLocalName) : mNamespaceID(aNsID),
|
|
mLocalName(aLocalName)
|
|
{
|
|
}
|
|
|
|
txExpandedName(const txExpandedName& aOther) :
|
|
mNamespaceID(aOther.mNamespaceID),
|
|
mLocalName(aOther.mLocalName)
|
|
{
|
|
}
|
|
|
|
nsresult init(const nsAString& aQName, txNamespaceMap* aResolver,
|
|
bool aUseDefault);
|
|
|
|
void reset()
|
|
{
|
|
mNamespaceID = kNameSpaceID_None;
|
|
mLocalName = nullptr;
|
|
}
|
|
|
|
bool isNull()
|
|
{
|
|
return mNamespaceID == kNameSpaceID_None && !mLocalName;
|
|
}
|
|
|
|
txExpandedName& operator = (const txExpandedName& rhs)
|
|
{
|
|
mNamespaceID = rhs.mNamespaceID;
|
|
mLocalName = rhs.mLocalName;
|
|
return *this;
|
|
}
|
|
|
|
bool operator == (const txExpandedName& rhs) const
|
|
{
|
|
return ((mLocalName == rhs.mLocalName) &&
|
|
(mNamespaceID == rhs.mNamespaceID));
|
|
}
|
|
|
|
bool operator != (const txExpandedName& rhs) const
|
|
{
|
|
return ((mLocalName != rhs.mLocalName) ||
|
|
(mNamespaceID != rhs.mNamespaceID));
|
|
}
|
|
|
|
int32_t mNamespaceID;
|
|
RefPtr<nsIAtom> mLocalName;
|
|
};
|
|
|
|
#endif
|