зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1396694 (part 2) - Replace nsIAtom.idl with nsIAtom.h. r=froydnj.
Now that nsIAtom is non-scriptable, a .idl file isn't needed. I made the new nsIAtom.h file by starting with a generated nsIAtom.h file, and then cleaning it up and removing some stuff that wasn't necessary. --HG-- extra : rebase_source : 9655fd38984512bd96cf5555048f7774414f6d92
This commit is contained in:
Nicholas Nethercote
Родитель
4a2bc82d4c
Коммит
42a8532893
|
|
@ -7,7 +7,6 @@
|
|||
XPIDL_SOURCES += [
|
||||
'nsIArray.idl',
|
||||
'nsIArrayExtensions.idl',
|
||||
'nsIAtom.idl',
|
||||
'nsIHashable.idl',
|
||||
'nsIINIParser.idl',
|
||||
'nsIMutableArray.idl',
|
||||
|
|
@ -55,6 +54,7 @@ EXPORTS += [
|
|||
'nsExpirationTracker.h',
|
||||
'nsHashKeys.h',
|
||||
'nsHashPropertyBag.h',
|
||||
'nsIAtom.h',
|
||||
'nsInterfaceHashtable.h',
|
||||
'nsJSThingHashtable.h',
|
||||
'nsMathUtils.h',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,153 @@
|
|||
/* -*- 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 nsIAtom_h
|
||||
#define nsIAtom_h
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsString.h"
|
||||
#include "nsStringBuffer.h"
|
||||
|
||||
#define NS_IATOM_IID_STR "8b8c11d4-3ed5-4079-8974-73c7576cdb34"
|
||||
|
||||
#define NS_IATOM_IID \
|
||||
{0x8b8c11d4, 0x3ed5, 0x4079, \
|
||||
{ 0x89, 0x74, 0x73, 0xc7, 0x57, 0x6c, 0xdb, 0x34 }}
|
||||
|
||||
class nsIAtom : public nsISupports
|
||||
{
|
||||
public:
|
||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IATOM_IID)
|
||||
|
||||
NS_IMETHOD ToUTF8String(nsACString& aString) = 0;
|
||||
|
||||
NS_IMETHOD_(size_t)
|
||||
SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) = 0;
|
||||
|
||||
// The kind of atom we have, in order to be able to devirtualize hot stuff
|
||||
// looking at mKind.
|
||||
enum class AtomKind : uint8_t {
|
||||
DynamicAtom = 0,
|
||||
StaticAtom = 1,
|
||||
HTML5Atom = 2,
|
||||
};
|
||||
|
||||
bool Equals(char16ptr_t aString, uint32_t aLength) const
|
||||
{
|
||||
return mLength == aLength &&
|
||||
memcmp(mString, aString, mLength * sizeof(char16_t)) == 0;
|
||||
}
|
||||
|
||||
bool Equals(const nsAString& aString) const
|
||||
{
|
||||
return Equals(aString.BeginReading(), aString.Length());
|
||||
}
|
||||
|
||||
void SetKind(AtomKind aKind)
|
||||
{
|
||||
mKind = static_cast<uint32_t>(aKind);
|
||||
MOZ_ASSERT(Kind() == aKind);
|
||||
}
|
||||
|
||||
AtomKind Kind() const { return static_cast<AtomKind>(mKind); }
|
||||
|
||||
bool IsDynamicAtom() const { return Kind() == AtomKind::DynamicAtom; }
|
||||
bool IsHTML5Atom() const { return Kind() == AtomKind::HTML5Atom; }
|
||||
bool IsStaticAtom() const { return Kind() == AtomKind::StaticAtom; }
|
||||
|
||||
char16ptr_t GetUTF16String() const { return mString; }
|
||||
|
||||
uint32_t GetLength() const { return mLength; }
|
||||
|
||||
void ToString(nsAString& aBuf) const
|
||||
{
|
||||
// See the comment on |mString|'s declaration.
|
||||
nsStringBuffer::FromData(mString)->ToString(mLength, aBuf);
|
||||
}
|
||||
|
||||
nsStringBuffer* GetStringBuffer() const
|
||||
{
|
||||
// See the comment on |mString|'s declaration.
|
||||
return nsStringBuffer::FromData(mString);
|
||||
}
|
||||
|
||||
NS_IMETHOD_(MozExternalRefCountType) AddRef() final;
|
||||
NS_IMETHOD_(MozExternalRefCountType) Release() final;
|
||||
|
||||
// A hashcode that is better distributed than the actual atom pointer, for
|
||||
// use in situations that need a well-distributed hashcode.
|
||||
uint32_t hash() const { return mHash; }
|
||||
|
||||
protected:
|
||||
uint32_t mLength: 30;
|
||||
uint32_t mKind: 2; // nsIAtom::AtomKind
|
||||
uint32_t mHash;
|
||||
// WARNING! There is an invisible constraint on |mString|: the chars it
|
||||
// points to must belong to an nsStringBuffer. This is so that the
|
||||
// nsStringBuffer::FromData() calls above are valid.
|
||||
char16_t* mString;
|
||||
};
|
||||
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(nsIAtom, NS_IATOM_IID)
|
||||
|
||||
#define NS_DECL_NSIATOM \
|
||||
NS_IMETHOD ToUTF8String(nsACString& _retval) override; \
|
||||
NS_IMETHOD_(size_t) SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) override;
|
||||
|
||||
// The four forms of NS_Atomize (for use with |nsCOMPtr<nsIAtom>|) return the
|
||||
// atom for the string given. At any given time there will always be one atom
|
||||
// representing a given string. Atoms are intended to make string comparison
|
||||
// cheaper by simplifying it to pointer equality. A pointer to the atom that
|
||||
// does not own a reference is not guaranteed to be valid.
|
||||
|
||||
// Find an atom that matches the given UTF-8 string. The string is assumed to
|
||||
// be zero terminated. Never returns null.
|
||||
already_AddRefed<nsIAtom> NS_Atomize(const char* aUTF8String);
|
||||
|
||||
// Find an atom that matches the given UTF-8 string. Never returns null.
|
||||
already_AddRefed<nsIAtom> NS_Atomize(const nsACString& aUTF8String);
|
||||
|
||||
// Find an atom that matches the given UTF-16 string. The string is assumed to
|
||||
// be zero terminated. Never returns null.
|
||||
already_AddRefed<nsIAtom> NS_Atomize(const char16_t* aUTF16String);
|
||||
|
||||
// Find an atom that matches the given UTF-16 string. Never returns null.
|
||||
already_AddRefed<nsIAtom> NS_Atomize(const nsAString& aUTF16String);
|
||||
|
||||
// An optimized version of the method above for the main thread.
|
||||
already_AddRefed<nsIAtom> NS_AtomizeMainThread(const nsAString& aUTF16String);
|
||||
|
||||
// Return a count of the total number of atoms currently alive in the system.
|
||||
nsrefcnt NS_GetNumberOfAtoms();
|
||||
|
||||
// Return a pointer for a static atom for the string or null if there's no
|
||||
// static atom for this string.
|
||||
nsIAtom* NS_GetStaticAtom(const nsAString& aUTF16String);
|
||||
|
||||
// Seal the static atom table.
|
||||
void NS_SealStaticAtomTable();
|
||||
|
||||
class nsAtomString : public nsString
|
||||
{
|
||||
public:
|
||||
explicit nsAtomString(const nsIAtom* aAtom) { aAtom->ToString(*this); }
|
||||
};
|
||||
|
||||
class nsAtomCString : public nsCString
|
||||
{
|
||||
public:
|
||||
explicit nsAtomCString(nsIAtom* aAtom) { aAtom->ToUTF8String(*this); }
|
||||
};
|
||||
|
||||
class nsDependentAtomString : public nsDependentString
|
||||
{
|
||||
public:
|
||||
explicit nsDependentAtomString(const nsIAtom* aAtom)
|
||||
: nsDependentString(aAtom->GetUTF16String(), aAtom->GetLength())
|
||||
{}
|
||||
};
|
||||
|
||||
#endif // nsIAtom_h
|
||||
|
|
@ -1,198 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* 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 "nsISupports.idl"
|
||||
|
||||
%{C++
|
||||
#include "nsStringGlue.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsStringBuffer.h"
|
||||
%}
|
||||
|
||||
native MallocSizeOf(mozilla::MallocSizeOf);
|
||||
|
||||
/*
|
||||
* Should this really be scriptable? Using atoms from script or proxies
|
||||
* could be dangerous since double-wrapping could lead to loss of
|
||||
* pointer identity.
|
||||
*/
|
||||
|
||||
[builtinclass, uuid(8b8c11d4-3ed5-4079-8974-73c7576cdb34)]
|
||||
interface nsIAtom : nsISupports
|
||||
{
|
||||
/**
|
||||
* Get the UTF8 value for the string
|
||||
*/
|
||||
[noscript] AUTF8String toUTF8String();
|
||||
|
||||
[noscript, notxpcom]
|
||||
size_t SizeOfIncludingThis(in MallocSizeOf aMallocSizeOf);
|
||||
|
||||
%{C++
|
||||
// The kind of atom we have, in order to be able to devirtualize hot stuff
|
||||
// looking at mKind.
|
||||
enum class AtomKind : uint8_t {
|
||||
DynamicAtom = 0,
|
||||
StaticAtom = 1,
|
||||
HTML5Atom = 2,
|
||||
};
|
||||
|
||||
// note these are NOT virtual so they won't muck with the vtable!
|
||||
inline bool Equals(char16ptr_t aString, uint32_t aLength) const
|
||||
{
|
||||
return mLength == aLength &&
|
||||
memcmp(mString, aString, mLength * sizeof(char16_t)) == 0;
|
||||
}
|
||||
|
||||
inline bool Equals(const nsAString& aString) const {
|
||||
return Equals(aString.BeginReading(), aString.Length());
|
||||
}
|
||||
|
||||
inline void SetKind(AtomKind aKind) {
|
||||
mKind = static_cast<uint32_t>(aKind);
|
||||
MOZ_ASSERT(Kind() == aKind);
|
||||
}
|
||||
|
||||
inline AtomKind Kind() const {
|
||||
return static_cast<AtomKind>(mKind);
|
||||
}
|
||||
|
||||
inline bool IsDynamicAtom() const {
|
||||
return Kind() == AtomKind::DynamicAtom;
|
||||
}
|
||||
|
||||
inline bool IsHTML5Atom() const {
|
||||
return Kind() == AtomKind::HTML5Atom;
|
||||
}
|
||||
|
||||
inline bool IsStaticAtom() const {
|
||||
return Kind() == AtomKind::StaticAtom;
|
||||
}
|
||||
|
||||
inline char16ptr_t GetUTF16String() const {
|
||||
return mString;
|
||||
}
|
||||
|
||||
inline uint32_t GetLength() const {
|
||||
return mLength;
|
||||
}
|
||||
|
||||
inline void ToString(nsAString& aBuf) const {
|
||||
// See the comment on |mString|'s declaration.
|
||||
nsStringBuffer::FromData(mString)->ToString(mLength, aBuf);
|
||||
}
|
||||
|
||||
inline nsStringBuffer* GetStringBuffer() const {
|
||||
// See the comment on |mString|'s declaration.
|
||||
return nsStringBuffer::FromData(mString);
|
||||
}
|
||||
|
||||
NS_IMETHOD_(MozExternalRefCountType) AddRef() final;
|
||||
NS_IMETHOD_(MozExternalRefCountType) Release() final;
|
||||
|
||||
/**
|
||||
* A hashcode that is better distributed than the actual atom
|
||||
* pointer, for use in situations that need a well-distributed
|
||||
* hashcode.
|
||||
*/
|
||||
inline uint32_t hash() const {
|
||||
return mHash;
|
||||
}
|
||||
|
||||
protected:
|
||||
uint32_t mLength: 30;
|
||||
uint32_t mKind: 2; // nsIAtom::AtomKind
|
||||
uint32_t mHash;
|
||||
/**
|
||||
* WARNING! There is an invisible constraint on |mString|: the chars it
|
||||
* points to must belong to an nsStringBuffer. This is so that the
|
||||
* nsStringBuffer::FromData() calls above are valid.
|
||||
*/
|
||||
char16_t* mString;
|
||||
%}
|
||||
};
|
||||
|
||||
|
||||
%{C++
|
||||
/*
|
||||
* The four forms of NS_Atomize (for use with |nsCOMPtr<nsIAtom>|) return the
|
||||
* atom for the string given. At any given time there will always be one atom
|
||||
* representing a given string. Atoms are intended to make string comparison
|
||||
* cheaper by simplifying it to pointer equality. A pointer to the atom that
|
||||
* does not own a reference is not guaranteed to be valid.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* Find an atom that matches the given UTF-8 string.
|
||||
* The string is assumed to be zero terminated. Never returns null.
|
||||
*/
|
||||
extern already_AddRefed<nsIAtom> NS_Atomize(const char* aUTF8String);
|
||||
|
||||
/**
|
||||
* Find an atom that matches the given UTF-8 string. Never returns null.
|
||||
*/
|
||||
extern already_AddRefed<nsIAtom> NS_Atomize(const nsACString& aUTF8String);
|
||||
|
||||
/**
|
||||
* Find an atom that matches the given UTF-16 string.
|
||||
* The string is assumed to be zero terminated. Never returns null.
|
||||
*/
|
||||
extern already_AddRefed<nsIAtom> NS_Atomize(const char16_t* aUTF16String);
|
||||
|
||||
/**
|
||||
* Find an atom that matches the given UTF-16 string. Never returns null.
|
||||
*/
|
||||
extern already_AddRefed<nsIAtom> NS_Atomize(const nsAString& aUTF16String);
|
||||
|
||||
/**
|
||||
* An optimized version of the method above for the main thread.
|
||||
*/
|
||||
extern already_AddRefed<nsIAtom> NS_AtomizeMainThread(const nsAString& aUTF16String);
|
||||
|
||||
/**
|
||||
* Return a count of the total number of atoms currently
|
||||
* alive in the system.
|
||||
*/
|
||||
extern nsrefcnt NS_GetNumberOfAtoms(void);
|
||||
|
||||
/**
|
||||
* Return a pointer for a static atom for the string or null if there's
|
||||
* no static atom for this string.
|
||||
*/
|
||||
extern nsIAtom* NS_GetStaticAtom(const nsAString& aUTF16String);
|
||||
|
||||
/**
|
||||
* Seal the static atom table
|
||||
*/
|
||||
extern void NS_SealStaticAtomTable();
|
||||
|
||||
class nsAtomString : public nsString
|
||||
{
|
||||
public:
|
||||
explicit nsAtomString(const nsIAtom* aAtom)
|
||||
{
|
||||
aAtom->ToString(*this);
|
||||
}
|
||||
};
|
||||
|
||||
class nsAtomCString : public nsCString
|
||||
{
|
||||
public:
|
||||
explicit nsAtomCString(nsIAtom* aAtom)
|
||||
{
|
||||
aAtom->ToUTF8String(*this);
|
||||
}
|
||||
};
|
||||
|
||||
class nsDependentAtomString : public nsDependentString
|
||||
{
|
||||
public:
|
||||
explicit nsDependentAtomString(const nsIAtom* aAtom)
|
||||
: nsDependentString(aAtom->GetUTF16String(), aAtom->GetLength())
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
%}
|
||||
Загрузка…
Ссылка в новой задаче