Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2024-04-02 22:57:21 +08:00
commit a944026bae
276 changed files with 1072 additions and 11108 deletions

View file

@ -357,14 +357,6 @@ struct nsTArray_SafeElementAtHelper<mozilla::OwningNonNull<E>, Derived>
}
};
// Servo bindings.
extern "C" void Gecko_EnsureTArrayCapacity(void* aArray,
size_t aCapacity,
size_t aElementSize);
extern "C" void Gecko_ClearPODTArray(void* aArray,
size_t aElementSize,
size_t aElementAlign);
MOZ_NORETURN MOZ_COLD void
InvalidArrayIndex_CRASH(size_t aIndex, size_t aLength);
@ -381,10 +373,6 @@ class nsTArray_base
// the same free().
template<class Allocator, class Copier>
friend class nsTArray_base;
friend void Gecko_EnsureTArrayCapacity(void* aArray, size_t aCapacity,
size_t aElemSize);
friend void Gecko_ClearPODTArray(void* aTArray, size_t aElementSize,
size_t aElementAlign);
protected:
typedef nsTArrayHeader Header;

View file

@ -1366,17 +1366,3 @@ AppendUCS4ToUTF16(const uint32_t aSource, nsAString& aDest)
aDest.Append(L_SURROGATE(aSource));
}
}
extern "C" {
void Gecko_AppendUTF16toCString(nsACString* aThis, const nsAString* aOther)
{
AppendUTF16toUTF8(*aOther, *aThis);
}
void Gecko_AppendUTF8toString(nsAString* aThis, const nsACString* aOther)
{
AppendUTF8toUTF16(*aOther, *aThis);
}
}

View file

@ -350,38 +350,3 @@ nsStringBuffer::SizeOfIncludingThisEvenIfShared(mozilla::MallocSizeOf aMallocSiz
static_assert(sizeof(nsStringContainer_base) == sizeof(nsSubstring),
"internal and external strings must have the same size");
// Provide rust bindings to the nsA[C]String types
extern "C" {
void Gecko_FinalizeCString(nsACString* aThis)
{
aThis->~nsACString();
}
void Gecko_AssignCString(nsACString* aThis, const nsACString* aOther)
{
aThis->Assign(*aOther);
}
void Gecko_AppendCString(nsACString* aThis, const nsACString* aOther)
{
aThis->Append(*aOther);
}
void Gecko_FinalizeString(nsAString* aThis)
{
aThis->~nsAString();
}
void Gecko_AssignString(nsAString* aThis, const nsAString* aOther)
{
aThis->Assign(*aOther);
}
void Gecko_AppendString(nsAString* aThis, const nsAString* aOther)
{
aThis->Append(*aOther);
}
} // extern "C"