Backout aba6c73511a2 (bug 1307961) for massive test bustage resulting in a CLOSED TREE; r=alltheorange
This commit is contained in:
@@ -299,25 +299,35 @@ class FontFamilyListRefCnt final : public FontFamilyList {
|
||||
public:
|
||||
FontFamilyListRefCnt()
|
||||
: FontFamilyList()
|
||||
{}
|
||||
{
|
||||
MOZ_COUNT_CTOR(FontFamilyListRefCnt);
|
||||
}
|
||||
|
||||
explicit FontFamilyListRefCnt(FontFamilyType aGenericType)
|
||||
: FontFamilyList(aGenericType)
|
||||
{}
|
||||
{
|
||||
MOZ_COUNT_CTOR(FontFamilyListRefCnt);
|
||||
}
|
||||
|
||||
FontFamilyListRefCnt(const nsAString& aFamilyName,
|
||||
QuotedName aQuoted)
|
||||
: FontFamilyList(aFamilyName, aQuoted)
|
||||
{}
|
||||
{
|
||||
MOZ_COUNT_CTOR(FontFamilyListRefCnt);
|
||||
}
|
||||
|
||||
FontFamilyListRefCnt(const FontFamilyListRefCnt& aOther)
|
||||
: FontFamilyList(aOther)
|
||||
{}
|
||||
{
|
||||
MOZ_COUNT_CTOR(FontFamilyListRefCnt);
|
||||
}
|
||||
|
||||
NS_INLINE_DECL_REFCOUNTING(FontFamilyListRefCnt);
|
||||
|
||||
private:
|
||||
~FontFamilyListRefCnt() {}
|
||||
~FontFamilyListRefCnt() {
|
||||
MOZ_COUNT_DTOR(FontFamilyListRefCnt);
|
||||
}
|
||||
};
|
||||
|
||||
struct RGBAColorData
|
||||
@@ -1110,6 +1120,7 @@ private:
|
||||
: mRefCnt(0)
|
||||
, mCount(aItemCount)
|
||||
{
|
||||
MOZ_COUNT_CTOR(nsCSSValue::Array);
|
||||
CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
|
||||
new (val) nsCSSValue();
|
||||
}
|
||||
@@ -1117,6 +1128,7 @@ private:
|
||||
|
||||
~Array()
|
||||
{
|
||||
MOZ_COUNT_DTOR(nsCSSValue::Array);
|
||||
CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
|
||||
val->~nsCSSValue();
|
||||
}
|
||||
@@ -1186,12 +1198,14 @@ struct nsCSSValueSharedList final {
|
||||
nsCSSValueSharedList()
|
||||
: mHead(nullptr)
|
||||
{
|
||||
MOZ_COUNT_CTOR(nsCSSValueSharedList);
|
||||
}
|
||||
|
||||
// Takes ownership of aList.
|
||||
explicit nsCSSValueSharedList(nsCSSValueList* aList)
|
||||
: mHead(aList)
|
||||
{
|
||||
MOZ_COUNT_CTOR(nsCSSValueSharedList);
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -1828,12 +1842,16 @@ public:
|
||||
, mComponent2(aComponent2)
|
||||
, mComponent3(aComponent3)
|
||||
, mAlpha(aAlpha)
|
||||
{}
|
||||
{
|
||||
MOZ_COUNT_CTOR(nsCSSValueFloatColor);
|
||||
}
|
||||
|
||||
private:
|
||||
// Private destructor, to discourage deletion outside of Release():
|
||||
~nsCSSValueFloatColor()
|
||||
{}
|
||||
{
|
||||
MOZ_COUNT_DTOR(nsCSSValueFloatColor);
|
||||
}
|
||||
|
||||
public:
|
||||
bool operator==(nsCSSValueFloatColor& aOther) const;
|
||||
|
||||
Reference in New Issue
Block a user