Bug 1551782. Remove now-unused nsCOMArray::Forget and nsCOMArray::Adopt methods. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D31246

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Boris Zbarsky 2019-05-16 15:13:44 +00:00
Родитель 2c019d2592
Коммит cbf64dc6ab
2 изменённых файлов: 0 добавлений и 51 удалений

Просмотреть файл

@ -250,24 +250,3 @@ bool nsCOMArray_base::SetCount(int32_t aNewCount) {
mArray.SetLength(aNewCount);
return true;
}
void nsCOMArray_base::Adopt(nsISupports** aElements, uint32_t aSize) {
Clear();
mArray.AppendElements(aElements, aSize);
// Free the allocated array as well.
free(aElements);
}
uint32_t nsCOMArray_base::Forget(nsISupports*** aElements) {
uint32_t length = Length();
size_t array_size = sizeof(nsISupports*) * length;
nsISupports** array = static_cast<nsISupports**>(moz_xmalloc(array_size));
memmove(array, Elements(), array_size);
*aElements = array;
// Don't Release the contained pointers; the caller of the method will
// do this eventually.
mArray.Clear();
return length;
}

Просмотреть файл

@ -94,9 +94,6 @@ class nsCOMArray_base {
mArray.SwapElements(aOther.mArray);
}
void Adopt(nsISupports** aElements, uint32_t aCount);
uint32_t Forget(nsISupports*** aElements);
public:
// elements in the array (including null elements!)
int32_t Count() const { return mArray.Length(); }
@ -345,33 +342,6 @@ class nsCOMArray : public nsCOMArray_base {
nsCOMArray_base::SwapElements(aOther);
}
/**
* Adopt parameters that resulted from an XPIDL outparam. The aElements
* parameter will be freed as a result of the call.
*
* Example usage:
* nsCOMArray<nsISomeInterface> array;
* nsISomeInterface** elements;
* uint32_t length;
* ptr->GetSomeArray(&elements, &length);
* array.Adopt(elements, length);
*/
void Adopt(T** aElements, uint32_t aSize) {
nsCOMArray_base::Adopt(reinterpret_cast<nsISupports**>(aElements), aSize);
}
/**
* Export the contents of this array to an XPIDL outparam. The array will be
* Clear()'d after this operation.
*
* Example usage:
* nsCOMArray<nsISomeInterface> array;
* *length = array.Forget(retval);
*/
uint32_t Forget(T*** aElements) {
return nsCOMArray_base::Forget(reinterpret_cast<nsISupports***>(aElements));
}
// Methods for range-based for loops.
iterator begin() { return iterator(*this, 0); }
const_iterator begin() const { return const_iterator(*this, 0); }